diff --git a/Polyhedron/include/CGAL/boost/graph/PMP_properties_Polyhedron_3.h b/Polyhedron/include/CGAL/boost/graph/PMP_properties_Polyhedron_3.h
index c1e7558d813..1de482d19a7 100644
--- a/Polyhedron/include/CGAL/boost/graph/PMP_properties_Polyhedron_3.h
+++ b/Polyhedron/include/CGAL/boost/graph/PMP_properties_Polyhedron_3.h
@@ -112,7 +112,7 @@ BOOST_MPL_HAS_XXX_TRAIT_DEF(Plane_3)
 template <class Gt, class I, CGAL_HDS_PARAM_, class A>
 struct Get_static_property_map {
   typedef boost::graph_traits<CGAL::Polyhedron_3<Gt,I,HDS,A> > Graph_traits;
-  typedef CGAL::static_property_map<typename Graph_traits::face_descriptor,
+  typedef CGAL::Static_property_map<typename Graph_traits::face_descriptor,
                                     std::pair<int,int> > type;
 };
 
diff --git a/Property_map/include/CGAL/property_map.h b/Property_map/include/CGAL/property_map.h
index 2d1bbd2f33e..310700cd470 100644
--- a/Property_map/include/CGAL/property_map.h
+++ b/Property_map/include/CGAL/property_map.h
@@ -39,8 +39,10 @@ namespace CGAL {
 
 /// \cond SKIP_DOXYGEN
 
-  template <typename K, typename V>
-class static_property_map
+/// This class is almost the same as boost::static_property_map
+/// The difference is that it is writable, although put() does nothing
+template <typename K, typename V>
+class Static_property_map
 {
   typedef K key_type;
   typedef V value_type;
@@ -49,18 +51,18 @@ class static_property_map
   V v;
 
 public:
-  static_property_map(V pv)
+  Static_property_map(V pv)
     :v(pv){}
   inline friend
   value_type
-  get(const static_property_map& pm, const key_type&)
+  get(const Static_property_map& pm, const key_type&)
   {
     return pm.v;
   }
 
   inline friend
   void
-  put(static_property_map& pm, const key_type&, const value_type&)
+  put(Static_property_map& pm, const key_type&, const value_type&)
   {}
 };