diff --git a/Builds/VisualStudio2012/beast.vcxproj b/Builds/VisualStudio2012/beast.vcxproj
index 3fab76e0d..0b37aeb61 100644
--- a/Builds/VisualStudio2012/beast.vcxproj
+++ b/Builds/VisualStudio2012/beast.vcxproj
@@ -73,7 +73,7 @@
     <ClInclude Include="..\..\beast\intrusive\PointerTraits.h" />
     <ClInclude Include="..\..\beast\mpl.h" />
     <ClInclude Include="..\..\beast\mpl\AddConst.h" />
-    <ClInclude Include="..\..\beast\mpl\IfConst.h" />
+    <ClInclude Include="..\..\beast\mpl\IfCond.h" />
     <ClInclude Include="..\..\beast\mpl\PointerToOther.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveConst.h" />
     <ClInclude Include="..\..\beast\mpl\RemoveConstVolatile.h" />
diff --git a/Builds/VisualStudio2012/beast.vcxproj.filters b/Builds/VisualStudio2012/beast.vcxproj.filters
index a4a31b7aa..1765c75df 100644
--- a/Builds/VisualStudio2012/beast.vcxproj.filters
+++ b/Builds/VisualStudio2012/beast.vcxproj.filters
@@ -878,9 +878,6 @@
     <ClInclude Include="..\..\beast\mpl\AddConst.h">
       <Filter>beast\mpl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\beast\mpl\IfConst.h">
-      <Filter>beast\mpl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\beast\mpl.h">
       <Filter>beast</Filter>
     </ClInclude>
@@ -1025,6 +1022,9 @@
     <ClInclude Include="..\..\modules\beast_asio\http\UniformResourceLocator.h">
       <Filter>beast_asio\http</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\beast\mpl\IfCond.h">
+      <Filter>beast\mpl</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
diff --git a/beast/intrusive/ForwardList.h b/beast/intrusive/ForwardList.h
index 1cf6b069d..2a88225b9 100644
--- a/beast/intrusive/ForwardList.h
+++ b/beast/intrusive/ForwardList.h
@@ -150,10 +150,10 @@ class ForwardListIterator
         std::forward_iterator_tag,
         typename Container::value_type,
         typename Container::difference_type,
-        typename mpl::IfConst <IsConst,
+        typename mpl::IfCond <IsConst,
             typename Container::const_pointer,
             typename Container::pointer>::type,
-        typename mpl::IfConst <IsConst,
+        typename mpl::IfCond <IsConst,
             typename Container::const_reference,
             typename Container::reference>::type>
 {
@@ -167,10 +167,10 @@ protected:
 
 public:
     typedef typename Container::value_type value_type;
-    typedef typename mpl::IfConst <IsConst,
+    typedef typename mpl::IfCond <IsConst,
         typename Container::const_pointer,
         typename Container::pointer>::type pointer;
-    typedef typename mpl::IfConst <IsConst,
+    typedef typename mpl::IfCond <IsConst,
         typename Container::const_reference,
         typename Container::reference>::type reference;
 
diff --git a/beast/mpl.h b/beast/mpl.h
index 454f31174..051931e68 100644
--- a/beast/mpl.h
+++ b/beast/mpl.h
@@ -21,7 +21,7 @@
 #define BEAST_MPL_H_INCLUDED
 
 #include "mpl/AddConst.h"
-#include "mpl/IfConst.h"
+#include "mpl/IfCond.h"
 #include "mpl/PointerToOther.h"
 #include "mpl/RemoveConst.h"
 #include "mpl/RemoveConstVolatile.h"
diff --git a/beast/mpl/IfConst.h b/beast/mpl/IfCond.h
similarity index 91%
rename from beast/mpl/IfConst.h
rename to beast/mpl/IfCond.h
index 19f73b021..499dfced7 100644
--- a/beast/mpl/IfConst.h
+++ b/beast/mpl/IfCond.h
@@ -17,8 +17,8 @@
 */
 //==============================================================================
 
-#ifndef BEAST_MPL_IFCONST_H_INCLUDED
-#define BEAST_MPL_IFCONST_H_INCLUDED
+#ifndef BEAST_MPL_IFCOND_H_INCLUDED
+#define BEAST_MPL_IFCOND_H_INCLUDED
 
 namespace beast {
 namespace mpl {
@@ -28,13 +28,13 @@ namespace mpl {
 /// Select between T1 or T2 depending on Condition.
 /// @{
 template <bool Condition, typename T1, typename T2>
-struct IfConst
+struct IfCond
 {
     typedef T1 type;
 };
 
 template <typename T1, typename T2>
-struct IfConst <false, T1, T2>
+struct IfCond <false, T1, T2>
 {
     typedef T2 type;
 };
diff --git a/modules/beast_core/containers/DynamicList.h b/modules/beast_core/containers/DynamicList.h
index 38719e7c5..e048774c7 100644
--- a/modules/beast_core/containers/DynamicList.h
+++ b/modules/beast_core/containers/DynamicList.h
@@ -29,23 +29,23 @@ class DynamicListIterator
         std::bidirectional_iterator_tag,
         typename Container::value_type,
         typename Container::difference_type,
-        typename mpl::IfConst <IsConst,
+        typename mpl::IfCond <IsConst,
             typename Container::const_pointer,
             typename Container::pointer>::type,
-        typename mpl::IfConst <IsConst,
+        typename mpl::IfCond <IsConst,
             typename Container::const_reference,
             typename Container::reference>::type>
 {
 private:
-    typedef typename mpl::IfConst <IsConst,
+    typedef typename mpl::IfCond <IsConst,
         typename List <typename Container::Item>::const_iterator,
         typename List <typename Container::Item>::iterator>::type iterator_type;
 
-    typedef typename mpl::IfConst <IsConst,
+    typedef typename mpl::IfCond <IsConst,
         typename Container::const_pointer,
         typename Container::pointer>::type pointer;
 
-    typedef typename mpl::IfConst <IsConst,
+    typedef typename mpl::IfCond <IsConst,
         typename Container::const_reference,
         typename Container::reference>::type reference;