diff --git a/toolsrc/include/post_build_lint.h b/toolsrc/include/PostBuildLint.h
similarity index 100%
rename from toolsrc/include/post_build_lint.h
rename to toolsrc/include/PostBuildLint.h
diff --git a/toolsrc/include/BuildInfo.h b/toolsrc/include/PostBuildLint_BuildInfo.h
similarity index 99%
rename from toolsrc/include/BuildInfo.h
rename to toolsrc/include/PostBuildLint_BuildInfo.h
index 1fd032aa2..cf444ce90 100644
--- a/toolsrc/include/BuildInfo.h
+++ b/toolsrc/include/PostBuildLint_BuildInfo.h
@@ -3,7 +3,7 @@
 #include <unordered_map>
 #include "Paragraphs.h"
 #include <regex>
-#include "BuildPolicies.h"
+#include "PostBuildLint_BuildPolicies.h"
 #include "opt_bool.h"
 
 namespace vcpkg::PostBuildLint
diff --git a/toolsrc/include/BuildPolicies.h b/toolsrc/include/PostBuildLint_BuildPolicies.h
similarity index 100%
rename from toolsrc/include/BuildPolicies.h
rename to toolsrc/include/PostBuildLint_BuildPolicies.h
diff --git a/toolsrc/src/post_build_lint.cpp b/toolsrc/src/PostBuildLint.cpp
similarity index 99%
rename from toolsrc/src/post_build_lint.cpp
rename to toolsrc/src/PostBuildLint.cpp
index 009f8019c..e7e976383 100644
--- a/toolsrc/src/post_build_lint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -5,7 +5,7 @@
 #include "vcpkg_System.h"
 #include "vcpkg_Environment.h"
 #include "coff_file_reader.h"
-#include "BuildInfo.h"
+#include "PostBuildLint_BuildInfo.h"
 
 namespace vcpkg::PostBuildLint
 {
diff --git a/toolsrc/src/BuildInfo.cpp b/toolsrc/src/PostBuildLint_BuildInfo.cpp
similarity index 99%
rename from toolsrc/src/BuildInfo.cpp
rename to toolsrc/src/PostBuildLint_BuildInfo.cpp
index 82243ebac..59896e168 100644
--- a/toolsrc/src/BuildInfo.cpp
+++ b/toolsrc/src/PostBuildLint_BuildInfo.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include  "BuildInfo.h"
+#include  "PostBuildLint_BuildInfo.h"
 #include "vcpkg_Checks.h"
 #include "opt_bool.h"
 #include "vcpkglib_helpers.h"
diff --git a/toolsrc/src/BuildPolicies.cpp b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
similarity index 97%
rename from toolsrc/src/BuildPolicies.cpp
rename to toolsrc/src/PostBuildLint_BuildPolicies.cpp
index ed0f76c38..d7d67c991 100644
--- a/toolsrc/src/BuildPolicies.cpp
+++ b/toolsrc/src/PostBuildLint_BuildPolicies.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "BuildPolicies.h"
+#include "PostBuildLint_BuildPolicies.h"
 #include "vcpkg_Checks.h"
 
 namespace vcpkg::PostBuildLint::BuildPolicies
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
index ccc3c8d9f..c5a278450 100644
--- a/toolsrc/src/commands_build.cpp
+++ b/toolsrc/src/commands_build.cpp
@@ -3,7 +3,7 @@
 #include "StatusParagraphs.h"
 #include "vcpkglib.h"
 #include "vcpkg_Input.h"
-#include "post_build_lint.h"
+#include "PostBuildLint.h"
 #include "vcpkg_Dependencies.h"
 #include "vcpkg_System.h"
 #include "vcpkg_Environment.h"
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
index 802198ccb..c1730367d 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj
@@ -137,8 +137,8 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\include\BinaryParagraph.h" />
-    <ClInclude Include="..\include\BuildInfo.h" />
-    <ClInclude Include="..\include\BuildPolicies.h" />
+    <ClInclude Include="..\include\PostBuildLint_BuildInfo.h" />
+    <ClInclude Include="..\include\PostBuildLint_BuildPolicies.h" />
     <ClInclude Include="..\include\coff_file_reader.h" />
     <ClInclude Include="..\include\expected.h" />
     <ClInclude Include="..\include\filesystem_fs.h" />
@@ -150,7 +150,7 @@
     <ClInclude Include="..\include\package_spec_parse_result.h" />
     <ClInclude Include="..\include\Paragraphs.h" />
     <ClInclude Include="..\include\pch.h" />
-    <ClInclude Include="..\include\post_build_lint.h" />
+    <ClInclude Include="..\include\PostBuildLint.h" />
     <ClInclude Include="..\include\SourceParagraph.h" />
     <ClInclude Include="..\include\StatusParagraph.h" />
     <ClInclude Include="..\include\StatusParagraphs.h" />
@@ -176,8 +176,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\BinaryParagraph.cpp" />
-    <ClCompile Include="..\src\BuildInfo.cpp" />
-    <ClCompile Include="..\src\BuildPolicies.cpp" />
+    <ClCompile Include="..\src\PostBuildLint_BuildInfo.cpp" />
+    <ClCompile Include="..\src\PostBuildLint_BuildPolicies.cpp" />
     <ClCompile Include="..\src\coff_file_reader.cpp" />
     <ClCompile Include="..\src\commands_available_commands.cpp" />
     <ClCompile Include="..\src\commands_build.cpp" />
@@ -207,7 +207,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\src\post_build_lint.cpp" />
+    <ClCompile Include="..\src\PostBuildLint.cpp" />
     <ClCompile Include="..\src\Stopwatch.cpp" />
     <ClCompile Include="..\src\vcpkglib.cpp" />
     <ClCompile Include="..\src\package_spec.cpp" />
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
index 4461655d1..65d2dd202 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
@@ -48,9 +48,6 @@
     <ClCompile Include="..\src\vcpkg_info.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\BuildInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\metrics.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -123,9 +120,6 @@
     <ClCompile Include="..\src\MachineType.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\post_build_lint.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\vcpkg_cmd_arguments.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -156,7 +150,13 @@
     <ClCompile Include="..\src\opt_bool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\BuildPolicies.cpp">
+    <ClCompile Include="..\src\PostBuildLint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\PostBuildLint_BuildInfo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\PostBuildLint_BuildPolicies.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
@@ -194,9 +194,6 @@
     <ClInclude Include="..\include\vcpkg_info.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\BuildInfo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\metrics.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -212,9 +209,6 @@
     <ClInclude Include="..\include\MachineType.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\post_build_lint.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\vcpkg_cmd_arguments.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -269,7 +263,13 @@
     <ClInclude Include="..\include\vcpkg_optional.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\BuildPolicies.h">
+    <ClInclude Include="..\include\PostBuildLint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\PostBuildLint_BuildInfo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\PostBuildLint_BuildPolicies.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>