diff --git a/aoc2020.sln b/aoc2020.sln
index 3a32f4b..c524315 100644
--- a/aoc2020.sln
+++ b/aoc2020.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.30709.132
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "aoc2020", "aoc2020\aoc2020.csproj", "{3D60F1A0-0DD9-4FF9-B85B-D491B13ACAE7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aoc.tests", "aoc.tests\aoc.tests.csproj", "{4E841B34-CF2F-4751-B31D-8E1D5FCEC8F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "aoc2020.test", "aoc2020.test\aoc2020.test.csproj", "{4E841B34-CF2F-4751-B31D-8E1D5FCEC8F6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/aoc.tests/DayTests.cs b/aoc2020.test/DayTests.cs
similarity index 98%
rename from aoc.tests/DayTests.cs
rename to aoc2020.test/DayTests.cs
index 3b2730d..f493c77 100644
--- a/aoc.tests/DayTests.cs
+++ b/aoc2020.test/DayTests.cs
@@ -3,7 +3,7 @@ using System.Diagnostics;
 using aoc2020;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace aoc.tests
+namespace aoc2020.test
 {
     [TestClass]
     public class DayTests
diff --git a/aoc.tests/aoc.tests.csproj b/aoc2020.test/aoc2020.test.csproj
similarity index 100%
rename from aoc.tests/aoc.tests.csproj
rename to aoc2020.test/aoc2020.test.csproj
diff --git a/aoc2020/Day.cs b/aoc2020/Day.cs
index ff1ded0..e6f16d4 100644
--- a/aoc2020/Day.cs
+++ b/aoc2020/Day.cs
@@ -18,7 +18,7 @@ namespace aoc2020
             File.ReadLines(FileName);
 
         protected virtual string FileName =>
-            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"input/day{DayNumber}.in");
+            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"input/day{DayNumber,2:0#}.in");
 
         public abstract string Part1();
         public abstract string Part2();
diff --git a/aoc2020/input/day1.in b/aoc2020/input/day01.in
similarity index 100%
rename from aoc2020/input/day1.in
rename to aoc2020/input/day01.in
diff --git a/aoc2020/input/day2.in b/aoc2020/input/day02.in
similarity index 100%
rename from aoc2020/input/day2.in
rename to aoc2020/input/day02.in
diff --git a/aoc2020/input/day3.in b/aoc2020/input/day03.in
similarity index 100%
rename from aoc2020/input/day3.in
rename to aoc2020/input/day03.in
diff --git a/aoc2020/input/day4.in b/aoc2020/input/day04.in
similarity index 100%
rename from aoc2020/input/day4.in
rename to aoc2020/input/day04.in
diff --git a/aoc2020/input/day5.in b/aoc2020/input/day05.in
similarity index 100%
rename from aoc2020/input/day5.in
rename to aoc2020/input/day05.in
diff --git a/aoc2020/input/day6.in b/aoc2020/input/day06.in
similarity index 100%
rename from aoc2020/input/day6.in
rename to aoc2020/input/day06.in
diff --git a/aoc2020/input/day7.in b/aoc2020/input/day07.in
similarity index 100%
rename from aoc2020/input/day7.in
rename to aoc2020/input/day07.in
diff --git a/aoc2020/input/day8.in b/aoc2020/input/day08.in
similarity index 100%
rename from aoc2020/input/day8.in
rename to aoc2020/input/day08.in
diff --git a/aoc2020/input/day9.in b/aoc2020/input/day09.in
similarity index 100%
rename from aoc2020/input/day9.in
rename to aoc2020/input/day09.in