diff --git a/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp b/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
index 494bc064..725af756 100644
--- a/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
+++ b/include/boost/fusion/adapted/struct/detail/adapt_base_assoc_attr_filler.hpp
@@ -21,27 +21,27 @@
 #if BOOST_PP_VARIADICS
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0(...)                           \
-    BOOST_FUSION_ADAPT_ASSOC_STRUCT_ATTRIBUTE_FILLER(__VA_ARGS__)               \
+    BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(__VA_ARGS__)                      \
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_1
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_1(...)                           \
-    BOOST_FUSION_ADAPT_ASSOC_STRUCT_ATTRIBUTE_FILLER(__VA_ARGS__)               \
+    BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(__VA_ARGS__)                      \
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
 
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_ATTRIBUTE_FILLER(...)                   \
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(...)                          \
       ((BOOST_PP_VARIADIC_SIZE(__VA_ARGS__), (__VA_ARGS__)))
 
 #else
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0(X, Y, Z)                       \
-    BOOST_FUSION_ADAPT_ASSOC_STRUCT_ATTRIBUTE_FILLER(X, Y, Z)                   \
+    BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(X, Y, Z)                          \
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_1
 
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_1(X, Y, Z)                       \
-    BOOST_FUSION_ADAPT_ASSOC_STRUCT_ATTRIBUTE_FILLER(X, Y, Z)                   \
+    BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(X, Y, Z)                          \
     BOOST_FUSION_ADAPT_ASSOC_STRUCT_FILLER_0
 
-#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_ATTRIBUTE_FILLER(X, Y, Z)               \
+#define BOOST_FUSION_ADAPT_ASSOC_STRUCT_WRAP_ATTR(X, Y, Z)                      \
     BOOST_PP_IF(BOOST_PP_IS_EMPTY(X),                                           \
       ((2, (Y,Z))),                                                             \
       ((3, (X,Y,Z)))                                                            \
diff --git a/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp b/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
index 096cc1b9..ac3d90ad 100644
--- a/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
+++ b/include/boost/fusion/adapted/struct/detail/adapt_base_attr_filler.hpp
@@ -20,17 +20,17 @@
 
 
 #define BOOST_FUSION_ADAPT_STRUCT_FILLER_0(X, Y)                                \
-    BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTE_FILLER(X,Y)                             \
+    BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(X,Y)                                    \
     BOOST_FUSION_ADAPT_STRUCT_FILLER_1
 
 #define BOOST_FUSION_ADAPT_STRUCT_FILLER_1(X, Y)                                \
-    BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTE_FILLER(X,Y)                             \
+    BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(X,Y)                                    \
     BOOST_FUSION_ADAPT_STRUCT_FILLER_0
 
 #define BOOST_FUSION_ADAPT_STRUCT_FILLER_0_END
 #define BOOST_FUSION_ADAPT_STRUCT_FILLER_1_END
 
-#define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTE_FILLER(X, Y)                        \
+#define BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(X, Y)                               \
     BOOST_PP_IF(BOOST_PP_IS_EMPTY(X),                                           \
       ((1, (Y))),                                                               \
       ((2, (X,Y)))                                                              \
@@ -48,7 +48,7 @@
 #   define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER_OP(r, unused, elem)      \
         BOOST_PP_IF(BOOST_FUSION_PP_IS_SEQ(elem),                               \
             BOOST_PP_CAT( BOOST_FUSION_ADAPT_STRUCT_FILLER_0 elem ,_END),       \
-            BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTE_FILLER(BOOST_FUSION_ADAPT_AUTO, \
+            BOOST_FUSION_ADAPT_STRUCT_WRAP_ATTR(BOOST_FUSION_ADAPT_AUTO,        \
                 elem))
 
 #   define BOOST_FUSION_ADAPT_STRUCT_ATTRIBUTES_FILLER(...)                     \