diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index 21a12960dd..2d0b7f019e 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\xmpl.h" />
+    <ClInclude Include="..\..\beast\MPL.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\xnet.h" />
+    <ClInclude Include="..\..\beast\Net.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\xnet.cpp">
+    <ClCompile Include="..\..\beast\net\Net.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 528e2499f8..e318762522 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -1038,10 +1038,10 @@
     <ClInclude Include="..\..\beast\CStdInt.h">
       <Filter>beast</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\xmpl.h">
+    <ClInclude Include="..\..\beast\MPL.h">
       <Filter>beast</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\xnet.h">
+    <ClInclude Include="..\..\beast\Net.h">
       <Filter>beast</Filter>
     </ClInclude>
   </ItemGroup>
@@ -1565,7 +1565,7 @@
     <ClCompile Include="..\..\beast\net\impl\IPEndpoint.cpp">
       <Filter>beast\net\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\beast\net\xnet.cpp">
+    <ClCompile Include="..\..\beast\net\Net.cpp">
       <Filter>beast\net</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/beast/xmpl.h b/beast/MPL.h
similarity index 100%
rename from beast/xmpl.h
rename to beast/MPL.h
diff --git a/beast/xnet.h b/beast/Net.h
similarity index 100%
rename from beast/xnet.h
rename to beast/Net.h
diff --git a/beast/intrusive/ForwardList.h b/beast/intrusive/ForwardList.h
index 2a88225b97..8ace8541c5 100644
--- a/beast/intrusive/ForwardList.h
+++ b/beast/intrusive/ForwardList.h
@@ -23,7 +23,7 @@
 #include <iterator>
 
 #include "PointerTraits.h"
-#include "../mpl.h"
+#include "../MPL.h"
 
 // Ideas based on boost
 
diff --git a/beast/net/xnet.cpp b/beast/net/Net.cpp
similarity index 100%
rename from beast/net/xnet.cpp
rename to beast/net/Net.cpp
diff --git a/modules/beast_core/beast_core.h b/modules/beast_core/beast_core.h
index 3e1a266863..6f35a57c9c 100644
--- a/modules/beast_core/beast_core.h
+++ b/modules/beast_core/beast_core.h
@@ -254,7 +254,7 @@ extern BEAST_API void BEAST_CALLTYPE logAssertion (char const* file, int line) n
 
 // New header-only library modeled more closely according to boost
 #include "../../beast/intrusive/ForwardList.h"
-#include "../../beast/net.h"
+#include "../../beast/Net.h"
 
 //------------------------------------------------------------------------------