diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index 40682eac9..21a12960d 100644
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
@@ -73,7 +73,7 @@
     <ClInclude Include="..\..\beast\CStdInt.h" />
     <ClInclude Include="..\..\beast\intrusive\ForwardList.h" />
     <ClInclude Include="..\..\beast\intrusive\PointerTraits.h" />
-    <ClInclude Include="..\..\beast\mpl.h" />
+    <ClInclude Include="..\..\beast\xmpl.h" />
     <ClInclude Include="..\..\beast\mpl\AddConst.h" />
     <ClInclude Include="..\..\beast\mpl\IfCond.h" />
     <ClInclude Include="..\..\beast\mpl\PointerToOther.h" />
@@ -81,7 +81,7 @@
     <ClInclude Include="..\..\beast\mpl\RemoveConstVolatile.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveReference.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveVolatile.h" />
-    <ClInclude Include="..\..\beast\net.h" />
+    <ClInclude Include="..\..\beast\xnet.h" />
     <ClInclude Include="..\..\beast\net\IPEndpoint.h" />
     <ClInclude Include="..\..\modules\beast_asio\async\ComposedAsyncOperation.h" />
     <ClInclude Include="..\..\modules\beast_asio\async\SharedHandler.h" />
@@ -360,7 +360,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\beast\net\net.cpp">
+    <ClCompile Include="..\..\beast\net\xnet.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
diff --git a/Builds/VisualStudio2012/beast.vcxproj.filters b/Builds/VisualStudio2012/beast.vcxproj.filters
index 3f38cdd60..528e2499f 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -852,9 +852,6 @@
     <ClInclude Include="..\..\beast\mpl\AddConst.h">
       <Filter>beast\mpl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\mpl.h">
-      <Filter>beast</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\beast\mpl\PointerToOther.h">
       <Filter>beast\mpl</Filter>
     </ClInclude>
@@ -1032,9 +1029,6 @@
     <ClInclude Include="..\..\modules\beast_core\memory\SharedFunction.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\net.h">
-      <Filter>beast</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\beast\net\IPEndpoint.h">
       <Filter>beast\net</Filter>
     </ClInclude>
@@ -1044,6 +1038,12 @@
     <ClInclude Include="..\..\beast\CStdInt.h">
       <Filter>beast</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\beast\xmpl.h">
+      <Filter>beast</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\beast\xnet.h">
+      <Filter>beast</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\containers\AbstractFifo.cpp">
@@ -1565,7 +1565,7 @@
     <ClCompile Include="..\..\beast\net\impl\IPEndpoint.cpp">
       <Filter>beast\net\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\net\net.cpp">
+    <ClCompile Include="..\..\beast\net\xnet.cpp">
       <Filter>beast\net</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/beast/net/net.cpp b/beast/net/xnet.cpp
similarity index 100%
rename from beast/net/net.cpp
rename to beast/net/xnet.cpp
diff --git a/beast/mpl.h b/beast/xmpl.h
similarity index 100%
rename from beast/mpl.h
rename to beast/xmpl.h
diff --git a/beast/net.h b/beast/xnet.h
similarity index 100%
rename from beast/net.h
rename to beast/xnet.h