diff --git a/src/OpenMesh/Core/IO/OMFormat.hh b/src/OpenMesh/Core/IO/OMFormat.hh
index 1cb569f8..128b1e2f 100644
--- a/src/OpenMesh/Core/IO/OMFormat.hh
+++ b/src/OpenMesh/Core/IO/OMFormat.hh
@@ -504,8 +504,8 @@ namespace OMFormat {
 
   // -------------------- (re-)store integer with wanted number of bits (bytes)
 
-  typedef GenProg::True  t_signed;
-  typedef GenProg::False t_unsigned;
+  typedef GenProg::TrueType  t_signed;
+  typedef GenProg::FalseType t_unsigned;
 
   // helper to store a an integer
   template< typename T >
diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
index 7f860614..480ddc23 100644
--- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh
+++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh
@@ -377,20 +377,20 @@ public:
   }
 
   void set_prev_halfedge_handle(HalfedgeHandle _heh, HalfedgeHandle _pheh,
-                                GenProg::True)
+                                GenProg::TrueType)
   { halfedge(_heh).prev_halfedge_handle_ = _pheh; }
 
   void set_prev_halfedge_handle(HalfedgeHandle /* _heh */, HalfedgeHandle /* _pheh */,
-                                GenProg::False)
+                                GenProg::FalseType)
   {}
 
   HalfedgeHandle prev_halfedge_handle(HalfedgeHandle _heh) const
   { return prev_halfedge_handle(_heh, HasPrevHalfedge() ); }
 
-  HalfedgeHandle prev_halfedge_handle(HalfedgeHandle _heh, GenProg::True) const
+  HalfedgeHandle prev_halfedge_handle(HalfedgeHandle _heh, GenProg::TrueType) const
   { return halfedge(_heh).prev_halfedge_handle_; }
 
-  HalfedgeHandle prev_halfedge_handle(HalfedgeHandle _heh, GenProg::False) const
+  HalfedgeHandle prev_halfedge_handle(HalfedgeHandle _heh, GenProg::FalseType) const
   {
     if (is_boundary(_heh))
     {//iterating around the vertex should be faster than iterating the boundary
diff --git a/src/OpenMesh/Core/Utils/GenProg.hh b/src/OpenMesh/Core/Utils/GenProg.hh
index 5416c9b4..2f4d75ed 100644
--- a/src/OpenMesh/Core/Utils/GenProg.hh
+++ b/src/OpenMesh/Core/Utils/GenProg.hh
@@ -72,10 +72,10 @@ template <bool b> struct Bool2Type { enum { my_bool = b }; };
 template <int i>  struct Int2Type  { enum { my_int = i }; };
 
 /// Handy typedef for Bool2Type<true> classes
-typedef Bool2Type<true> True;
+typedef Bool2Type<true> TrueType;
 
 /// Handy typedef for Bool2Type<false> classes
-typedef Bool2Type<false> False;
+typedef Bool2Type<false> FalseType;
 
 //-----------------------------------------------------------------------------
 /// compile time assertions