diff --git a/include/boost/container/detail/adaptive_node_pool.hpp b/include/boost/container/detail/adaptive_node_pool.hpp
index 5cd1831..49ec1df 100644
--- a/include/boost/container/detail/adaptive_node_pool.hpp
+++ b/include/boost/container/detail/adaptive_node_pool.hpp
@@ -103,13 +103,13 @@ class shared_adaptive_node_pool
 {
  private:
    typedef private_adaptive_node_pool
-      <NodeSize, NodesPerBlock, MaxFreeBlocks, OverheadPercent, NodeAlign> private_node_allocator_t;
+      <NodeSize, NodesPerBlock, MaxFreeBlocks, OverheadPercent, NodeAlign> private_adaptive_node_pool_t;
  public:
-   typedef typename private_node_allocator_t::multiallocation_chain multiallocation_chain;
+   typedef typename private_adaptive_node_pool_t::multiallocation_chain multiallocation_chain;
 
    //!Constructor. Never throws
    shared_adaptive_node_pool()
-   : private_node_allocator_t(){}
+   : private_adaptive_node_pool_t(){}
 
    //!Destructor. Deallocates all allocated blocks. Never throws
    ~shared_adaptive_node_pool()
@@ -121,7 +121,7 @@ class shared_adaptive_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      return private_node_allocator_t::allocate_node();
+      return private_adaptive_node_pool_t::allocate_node();
    }
 
    //!Deallocates an array pointed by ptr. Never throws
@@ -130,7 +130,7 @@ class shared_adaptive_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      private_node_allocator_t::deallocate_node(ptr);
+      private_adaptive_node_pool_t::deallocate_node(ptr);
    }
 
    //!Allocates a singly linked list of n nodes ending in null pointer.
@@ -140,7 +140,7 @@ class shared_adaptive_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      return private_node_allocator_t::allocate_nodes(n, chain);
+      return private_adaptive_node_pool_t::allocate_nodes(n, chain);
    }
 
    void deallocate_nodes(multiallocation_chain &chain)
@@ -148,7 +148,7 @@ class shared_adaptive_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      private_node_allocator_t::deallocate_nodes(chain);
+      private_adaptive_node_pool_t::deallocate_nodes(chain);
    }
 
    //!Deallocates all the free blocks of memory. Never throws
@@ -157,7 +157,7 @@ class shared_adaptive_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      private_node_allocator_t::deallocate_free_blocks();
+      private_adaptive_node_pool_t::deallocate_free_blocks();
    }
 
    private:
diff --git a/include/boost/container/detail/node_pool.hpp b/include/boost/container/detail/node_pool.hpp
index b85aaae..2647eca 100644
--- a/include/boost/container/detail/node_pool.hpp
+++ b/include/boost/container/detail/node_pool.hpp
@@ -72,15 +72,15 @@ class shared_node_pool
    : public private_node_pool<NodeSize, NodesPerBlock, NodeAlign>
 {
    private:
-   typedef private_node_pool<NodeSize, NodesPerBlock, NodeAlign> private_node_allocator_t;
+   typedef private_node_pool<NodeSize, NodesPerBlock, NodeAlign> private_node_pool_t;
 
    public:
-   typedef typename private_node_allocator_t::free_nodes_t  free_nodes_t;
-   typedef typename private_node_allocator_t::multiallocation_chain multiallocation_chain;
+   typedef typename private_node_pool_t::free_nodes_t  free_nodes_t;
+   typedef typename private_node_pool_t::multiallocation_chain multiallocation_chain;
 
    //!Constructor from a segment manager. Never throws
    shared_node_pool()
-   : private_node_allocator_t(){}
+   : private_node_pool_t(){}
 
    //!Destructor. Deallocates all allocated blocks. Never throws
    ~shared_node_pool()
@@ -92,7 +92,7 @@ class shared_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      return private_node_allocator_t::allocate_node();
+      return private_node_pool_t::allocate_node();
    }
 
    //!Deallocates an array pointed by ptr. Never throws
@@ -101,7 +101,7 @@ class shared_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      private_node_allocator_t::deallocate_node(ptr);
+      private_node_pool_t::deallocate_node(ptr);
    }
 
    //!Allocates a singly linked list of n nodes ending in null pointer.
@@ -111,7 +111,7 @@ class shared_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      return private_node_allocator_t::allocate_nodes(n, chain);
+      return private_node_pool_t::allocate_nodes(n, chain);
    }
 
    void deallocate_nodes(multiallocation_chain &chain)
@@ -119,7 +119,7 @@ class shared_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      private_node_allocator_t::deallocate_nodes(chain);
+      private_node_pool_t::deallocate_nodes(chain);
    }
 
    //!Deallocates all the free blocks of memory. Never throws
@@ -128,7 +128,7 @@ class shared_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      private_node_allocator_t::deallocate_free_blocks();
+      private_node_pool_t::deallocate_free_blocks();
    }
 
    //!Deallocates all blocks. Never throws
@@ -137,7 +137,7 @@ class shared_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      private_node_allocator_t::purge_blocks();
+      private_node_pool_t::purge_blocks();
    }
 
    std::size_t num_free_nodes()
@@ -145,7 +145,7 @@ class shared_node_pool
       //-----------------------
       scoped_lock<default_mutex> guard(mutex_);
       //-----------------------
-      return private_node_allocator_t::num_free_nodes();
+      return private_node_pool_t::num_free_nodes();
    }
 
    private:
diff --git a/test/node_allocator_test.cpp b/test/node_allocator_test.cpp
index 832cbc0..38f602e 100644
--- a/test/node_allocator_test.cpp
+++ b/test/node_allocator_test.cpp
@@ -19,11 +19,11 @@ using namespace boost::container;
 typedef test::overaligned_copyable_int oint_t;
 
 //Alias adaptive pools that allocates ints
-typedef node_allocator<int> node_allocator_t;
-typedef node_allocator<oint_t> adapt_onode_allocator_t;
+typedef node_allocator<int>      node_allocator_t;
+typedef node_allocator<oint_t>   onode_allocator_t;
 
-typedef node_allocator<int, 256, 1> node_allocator_v1_t;
-typedef node_allocator<oint_t, 256, 1> adapt_onode_allocator_v1_t;
+typedef node_allocator<int, 256, 1>    node_allocator_v1_t;
+typedef node_allocator<oint_t, 256, 1> onode_allocator_v1_t;
 
 namespace boost {
 namespace container {
@@ -35,18 +35,18 @@ template class node_allocator<oint_t>;
 }} //boost::container
 
 //Alias list types
-typedef boost::container::list<int, node_allocator_t>                MyList;
-typedef boost::container::list<oint_t, adapt_onode_allocator_t>      MyOList;
+typedef boost::container::list<int, node_allocator_t>          MyList;
+typedef boost::container::list<oint_t, onode_allocator_t>      MyOList;
 
-typedef boost::container::list<int, node_allocator_v1_t>             MyListV1;
-typedef boost::container::list<oint_t, adapt_onode_allocator_v1_t>   MyOListV1;
+typedef boost::container::list<int, node_allocator_v1_t>       MyListV1;
+typedef boost::container::list<oint_t, onode_allocator_v1_t>   MyOListV1;
 
 //Alias vector types
-typedef boost::container::vector<int, node_allocator_t>              MyVector;
-typedef boost::container::vector<oint_t, adapt_onode_allocator_t>    MyOVector;
+typedef boost::container::vector<int, node_allocator_t>        MyVector;
+typedef boost::container::vector<oint_t, onode_allocator_t>    MyOVector;
 
-typedef boost::container::vector<int, node_allocator_v1_t>           MyVectorV1;
-typedef boost::container::vector<oint_t, adapt_onode_allocator_v1_t> MyOVectorV1;
+typedef boost::container::vector<int, node_allocator_v1_t>     MyVectorV1;
+typedef boost::container::vector<oint_t, onode_allocator_v1_t> MyOVectorV1;
 
 int main ()
 {