diff --git a/include/boost/interprocess/interprocess_fwd.hpp b/include/boost/interprocess/interprocess_fwd.hpp
index 882256e..4f56837 100644
--- a/include/boost/interprocess/interprocess_fwd.hpp
+++ b/include/boost/interprocess/interprocess_fwd.hpp
@@ -258,10 +258,10 @@ class offset_ptr;
 //////////////////////////////////////////////////////////////////////////////
 
 //Single segment memory allocation algorithms
-template<class MutexFamily, class VoidMutex = offset_ptr<void> >
+template<class MutexFamily, class VoidPointer = offset_ptr<void> >
 class simple_seq_fit;
 
-template<class MutexFamily, class VoidMutex = offset_ptr<void>, std::size_t MemAlignment = 0>
+template<class MutexFamily, class VoidPointer = offset_ptr<void>, std::size_t MemAlignment = 0>
 class rbtree_best_fit;
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/include/boost/interprocess/managed_shared_memory.hpp b/include/boost/interprocess/managed_shared_memory.hpp
index 284decc..c8a97ce 100644
--- a/include/boost/interprocess/managed_shared_memory.hpp
+++ b/include/boost/interprocess/managed_shared_memory.hpp
@@ -372,7 +372,7 @@ typedef basic_managed_shared_memory
 fixed_managed_shared_memory;
 
 //!Typedef for a default basic_managed_shared_memory
-//!of narrow characters to be placed in a fixed address
+//!of wide characters to be placed in a fixed address
 typedef basic_managed_shared_memory
    <wchar_t
    ,rbtree_best_fit<mutex_family, void*>