diff --git a/AdventOfCode/Solutions/Year2019/Day01/Solution.cs b/AdventOfCode/Solutions/Year2019/Day01/Day01.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day01/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day01/Day01.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day02/Solution.cs b/AdventOfCode/Solutions/Year2019/Day02/Day02.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day02/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day02/Day02.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day03/Solution.cs b/AdventOfCode/Solutions/Year2019/Day03/Day03.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day03/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day03/Day03.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day04/Solution.cs b/AdventOfCode/Solutions/Year2019/Day04/Day04.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day04/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day04/Day04.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day05/Solution.cs b/AdventOfCode/Solutions/Year2019/Day05/Day05.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day05/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day05/Day05.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day06/Solution.cs b/AdventOfCode/Solutions/Year2019/Day06/Day06.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day06/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day06/Day06.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day07/Solution.cs b/AdventOfCode/Solutions/Year2019/Day07/Day07.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day07/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day07/Day07.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day08/Solution.cs b/AdventOfCode/Solutions/Year2019/Day08/Day08.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day08/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day08/Day08.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day09/Solution.cs b/AdventOfCode/Solutions/Year2019/Day09/Day09.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day09/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day09/Day09.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day10/Solution.cs b/AdventOfCode/Solutions/Year2019/Day10/Day10.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day10/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day10/Day10.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day11/Solution.cs b/AdventOfCode/Solutions/Year2019/Day11/Day11.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day11/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day11/Day11.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day12/Solution.cs b/AdventOfCode/Solutions/Year2019/Day12/Day12.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day12/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day12/Day12.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day13/Solution.cs b/AdventOfCode/Solutions/Year2019/Day13/Day13.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day13/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day13/Day13.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day14/Solution.cs b/AdventOfCode/Solutions/Year2019/Day14/Day14.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day14/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day14/Day14.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day15/Solution.cs b/AdventOfCode/Solutions/Year2019/Day15/Day15.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day15/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day15/Day15.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day16/Solution.cs b/AdventOfCode/Solutions/Year2019/Day16/Day16.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day16/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day16/Day16.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day17/Solution.cs b/AdventOfCode/Solutions/Year2019/Day17/Day17.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day17/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day17/Day17.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day18/Solution.cs b/AdventOfCode/Solutions/Year2019/Day18/Day18.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day18/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day18/Day18.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day19/Solution.cs b/AdventOfCode/Solutions/Year2019/Day19/Day19.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day19/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day19/Day19.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day20/Solution.cs b/AdventOfCode/Solutions/Year2019/Day20/Day20.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day20/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day20/Day20.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day21/Solution.cs b/AdventOfCode/Solutions/Year2019/Day21/Day21.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day21/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day21/Day21.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day22/Solution.cs b/AdventOfCode/Solutions/Year2019/Day22/Day22.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day22/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day22/Day22.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day23/Solution.cs b/AdventOfCode/Solutions/Year2019/Day23/Day23.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day23/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day23/Day23.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day24/Solution.cs b/AdventOfCode/Solutions/Year2019/Day24/Day24.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day24/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day24/Day24.cs
diff --git a/AdventOfCode/Solutions/Year2019/Day25/Solution.cs b/AdventOfCode/Solutions/Year2019/Day25/Day25.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2019/Day25/Solution.cs
rename to AdventOfCode/Solutions/Year2019/Day25/Day25.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day01/Solution.cs b/AdventOfCode/Solutions/Year2020/Day01/Day01.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day01/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day01/Day01.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day02/Solution.cs b/AdventOfCode/Solutions/Year2020/Day02/Day02.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day02/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day02/Day02.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day03/Solution.cs b/AdventOfCode/Solutions/Year2020/Day03/Day03.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day03/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day03/Day03.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day04/Solution.cs b/AdventOfCode/Solutions/Year2020/Day04/Day04.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day04/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day04/Day04.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day05/Solution.cs b/AdventOfCode/Solutions/Year2020/Day05/Day05.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day05/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day05/Day05.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day06/Solution.cs b/AdventOfCode/Solutions/Year2020/Day06/Day06.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day06/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day06/Day06.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day07/Solution.cs b/AdventOfCode/Solutions/Year2020/Day07/Day07.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day07/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day07/Day07.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day08/Solution.cs b/AdventOfCode/Solutions/Year2020/Day08/Day08.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day08/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day08/Day08.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day09/Solution.cs b/AdventOfCode/Solutions/Year2020/Day09/Day09.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day09/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day09/Day09.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day10/Solution.cs b/AdventOfCode/Solutions/Year2020/Day10/Day10.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day10/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day10/Day10.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day11/Solution.cs b/AdventOfCode/Solutions/Year2020/Day11/Day11.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day11/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day11/Day11.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day12/Solution.cs b/AdventOfCode/Solutions/Year2020/Day12/Day12.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day12/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day12/Day12.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day13/Solution.cs b/AdventOfCode/Solutions/Year2020/Day13/Day13.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day13/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day13/Day13.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day14/Solution.cs b/AdventOfCode/Solutions/Year2020/Day14/Day14.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day14/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day14/Day14.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day15/Solution.cs b/AdventOfCode/Solutions/Year2020/Day15/Day15.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day15/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day15/Day15.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day16/Solution.cs b/AdventOfCode/Solutions/Year2020/Day16/Day16.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day16/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day16/Day16.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day17/Solution.cs b/AdventOfCode/Solutions/Year2020/Day17/Day17.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day17/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day17/Day17.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day18/Solution.cs b/AdventOfCode/Solutions/Year2020/Day18/Day18.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day18/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day18/Day18.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day19/Solution.cs b/AdventOfCode/Solutions/Year2020/Day19/Day19.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day19/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day19/Day19.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day20/Solution.cs b/AdventOfCode/Solutions/Year2020/Day20/Day20.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day20/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day20/Day20.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day21/Solution.cs b/AdventOfCode/Solutions/Year2020/Day21/Day21.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day21/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day21/Day21.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day22/Solution.cs b/AdventOfCode/Solutions/Year2020/Day22/Day22.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day22/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day22/Day22.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day23/Solution.cs b/AdventOfCode/Solutions/Year2020/Day23/Day23.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day23/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day23/Day23.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day24/Solution.cs b/AdventOfCode/Solutions/Year2020/Day24/Day24.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day24/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day24/Day24.cs
diff --git a/AdventOfCode/Solutions/Year2020/Day25/Solution.cs b/AdventOfCode/Solutions/Year2020/Day25/Day25.cs
similarity index 100%
rename from AdventOfCode/Solutions/Year2020/Day25/Solution.cs
rename to AdventOfCode/Solutions/Year2020/Day25/Day25.cs
diff --git a/AdventOfCode/UserScripts/GenerateSolutionFiles.ps1 b/AdventOfCode/UserScripts/GenerateSolutionFiles.ps1
index 8fcded3..3c2fe3e 100644
--- a/AdventOfCode/UserScripts/GenerateSolutionFiles.ps1
+++ b/AdventOfCode/UserScripts/GenerateSolutionFiles.ps1
@@ -39,7 +39,7 @@ if(!(Test-Path $newDirectory)) {
 }
 
 for($i = 1; $i -le 25; $i++) {
-    $newFile = Join-Path $newDirectory "Day$("{0:00}" -f $i)"  "Solution.cs"  
+    $newFile = Join-Path $newDirectory "Day$("{0:00}" -f $i)"  "Day$("{0:00}" -f $i).cs"
     if(!(Test-Path $newFile)) {
         New-Item $newFile -ItemType File -Value ($template -replace "<YEAR>", $Year -replace "<DAY>", "$("{0:00}" -f $i)") -Force | Out-Null
     }