diff --git a/src/openrct2-cli/openrct2-cli.vcxproj b/src/openrct2-cli/openrct2-cli.vcxproj
index 5f153bce6e..9a76591370 100644
--- a/src/openrct2-cli/openrct2-cli.vcxproj
+++ b/src/openrct2-cli/openrct2-cli.vcxproj
@@ -36,7 +36,6 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
       <AdditionalOptions>$(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
diff --git a/src/openrct2-dll/openrct2-dll.vcxproj b/src/openrct2-dll/openrct2-dll.vcxproj
index 9ba350c54f..5b00e1e85f 100644
--- a/src/openrct2-dll/openrct2-dll.vcxproj
+++ b/src/openrct2-dll/openrct2-dll.vcxproj
@@ -41,7 +41,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
       <AdditionalOptions>$(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
diff --git a/src/openrct2-ui/libopenrct2ui.vcxproj b/src/openrct2-ui/libopenrct2ui.vcxproj
index 0d9b5d811a..ab79111952 100644
--- a/src/openrct2-ui/libopenrct2ui.vcxproj
+++ b/src/openrct2-ui/libopenrct2ui.vcxproj
@@ -45,7 +45,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
       <AdditionalOptions>$(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
diff --git a/src/openrct2-win/openrct2-win.vcxproj b/src/openrct2-win/openrct2-win.vcxproj
index dcc0fade85..74b6e852ba 100644
--- a/src/openrct2-win/openrct2-win.vcxproj
+++ b/src/openrct2-win/openrct2-win.vcxproj
@@ -41,7 +41,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
       <AdditionalOptions>$(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
diff --git a/src/openrct2/drawing/Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp
similarity index 100%
rename from src/openrct2/drawing/Sprite.cpp
rename to src/openrct2/drawing/Drawing.Sprite.cpp
diff --git a/src/openrct2/drawing/String.cpp b/src/openrct2/drawing/Drawing.String.cpp
similarity index 100%
rename from src/openrct2/drawing/String.cpp
rename to src/openrct2/drawing/Drawing.String.cpp
diff --git a/src/openrct2/interface/Console.cpp b/src/openrct2/interface/InteractiveConsole.cpp
similarity index 100%
rename from src/openrct2/interface/Console.cpp
rename to src/openrct2/interface/InteractiveConsole.cpp
diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index e53bc9f93c..3cc7869f28 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -38,7 +38,6 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <ObjectFileName>$(IntDir)\%(RelativeDir)</ObjectFileName>
       <AdditionalOptions>$(OPENRCT2_CL_ADDITIONALOPTIONS) %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
diff --git a/src/openrct2/localisation/Date.cpp b/src/openrct2/localisation/Localisation.Date.cpp
similarity index 100%
rename from src/openrct2/localisation/Date.cpp
rename to src/openrct2/localisation/Localisation.Date.cpp
diff --git a/src/openrct2/paint/sprite/Peep.cpp b/src/openrct2/paint/sprite/Paint.Peep.cpp
similarity index 100%
rename from src/openrct2/paint/sprite/Peep.cpp
rename to src/openrct2/paint/sprite/Paint.Peep.cpp
diff --git a/src/openrct2/paint/sprite/Sprite.cpp b/src/openrct2/paint/sprite/Paint.Sprite.cpp
similarity index 100%
rename from src/openrct2/paint/sprite/Sprite.cpp
rename to src/openrct2/paint/sprite/Paint.Sprite.cpp
diff --git a/src/openrct2/paint/tile_element/Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/Banner.cpp
rename to src/openrct2/paint/tile_element/Paint.Banner.cpp
diff --git a/src/openrct2/paint/tile_element/Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/Entrance.cpp
rename to src/openrct2/paint/tile_element/Paint.Entrance.cpp
diff --git a/src/openrct2/paint/tile_element/LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/LargeScenery.cpp
rename to src/openrct2/paint/tile_element/Paint.LargeScenery.cpp
diff --git a/src/openrct2/paint/tile_element/Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/Path.cpp
rename to src/openrct2/paint/tile_element/Paint.Path.cpp
diff --git a/src/openrct2/paint/tile_element/SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/SmallScenery.cpp
rename to src/openrct2/paint/tile_element/Paint.SmallScenery.cpp
diff --git a/src/openrct2/paint/tile_element/Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/Surface.cpp
rename to src/openrct2/paint/tile_element/Paint.Surface.cpp
diff --git a/src/openrct2/paint/tile_element/TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/TileElement.cpp
rename to src/openrct2/paint/tile_element/Paint.TileElement.cpp
diff --git a/src/openrct2/paint/tile_element/Fence.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp
similarity index 100%
rename from src/openrct2/paint/tile_element/Fence.cpp
rename to src/openrct2/paint/tile_element/Paint.Wall.cpp