diff --git a/include/boost/unordered/unordered_node_map.hpp b/include/boost/unordered/unordered_node_map.hpp
index 81493a20..10202787 100644
--- a/include/boost/unordered/unordered_node_map.hpp
+++ b/include/boost/unordered/unordered_node_map.hpp
@@ -132,13 +132,13 @@ namespace boost {
         }
       };
 
-      template <class NodeMapTypes, class Allocator>
+      template <class TypePolicy, class Allocator>
       struct node_map_handle
-          : public detail::foa::node_handle_base<NodeMapTypes, Allocator>
+          : public detail::foa::node_handle_base<TypePolicy, Allocator>
       {
       private:
         using base_type =
-          detail::foa::node_handle_base<NodeMapTypes, Allocator>;
+          detail::foa::node_handle_base<TypePolicy, Allocator>;
 
         using typename base_type::type_policy;
 
@@ -146,8 +146,8 @@ namespace boost {
         friend class boost::unordered::unordered_node_map;
 
       public:
-        using key_type = typename NodeMapTypes::key_type;
-        using mapped_type = typename NodeMapTypes::mapped_type;
+        using key_type = typename TypePolicy::key_type;
+        using mapped_type = typename TypePolicy::mapped_type;
 
         constexpr node_map_handle() noexcept = default;
         node_map_handle(node_map_handle&& nh) noexcept = default;
diff --git a/include/boost/unordered/unordered_node_set.hpp b/include/boost/unordered/unordered_node_set.hpp
index 2fcd4f8b..d70cb608 100644
--- a/include/boost/unordered/unordered_node_set.hpp
+++ b/include/boost/unordered/unordered_node_set.hpp
@@ -114,13 +114,13 @@ namespace boost {
         }
       };
 
-      template <class NodeSetTypes, class Allocator>
+      template <class TypePolicy, class Allocator>
       struct node_set_handle
-          : public detail::foa::node_handle_base<NodeSetTypes, Allocator>
+          : public detail::foa::node_handle_base<TypePolicy, Allocator>
       {
       private:
         using base_type =
-          detail::foa::node_handle_base<NodeSetTypes, Allocator>;
+          detail::foa::node_handle_base<TypePolicy, Allocator>;
 
         using typename base_type::type_policy;
 
@@ -128,7 +128,7 @@ namespace boost {
         friend class boost::unordered::unordered_node_set;
 
       public:
-        using value_type = typename NodeSetTypes::value_type;
+        using value_type = typename TypePolicy::value_type;
 
         constexpr node_set_handle() noexcept = default;
         node_set_handle(node_set_handle&& nh) noexcept = default;