diff --git a/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
index 3c427059..16557a11 100644
--- a/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/at_impl.hpp
@@ -14,7 +14,7 @@
 
 namespace boost { namespace fusion {
     
-    struct array_tag;
+    struct boost_array_tag;
 
     namespace extension
     {
@@ -22,7 +22,7 @@ namespace boost { namespace fusion {
         struct at_impl;
 
         template<>
-        struct at_impl<array_tag>
+        struct at_impl<boost_array_tag>
         {
             template<typename Sequence, typename N>
             struct apply
diff --git a/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
index 06dc8c51..0798659b 100644
--- a/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/begin_impl.hpp
@@ -8,11 +8,11 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_27122005_1117)
 #define BOOST_FUSION_BEGIN_IMPL_27122005_1117
 
-#include <boost/fusion/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/boost_array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 
-    struct array_tag;
+    struct boost_array_tag;
 
     namespace extension
     {
@@ -20,7 +20,7 @@ namespace boost { namespace fusion {
         struct begin_impl;
 
         template <>
-        struct begin_impl<array_tag>
+        struct begin_impl<boost_array_tag>
         {
             template <typename Sequence>
             struct apply 
diff --git a/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
index 5d01f053..35762a03 100644
--- a/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/category_of_impl.hpp
@@ -12,7 +12,7 @@
 
 namespace boost { namespace fusion { 
 
-    struct array_tag;
+    struct boost_array_tag;
     struct random_access_traversal_tag;
 
     namespace extension
@@ -21,7 +21,7 @@ namespace boost { namespace fusion {
         struct category_of_impl;
 
         template<>
-        struct category_of_impl<array_tag>
+        struct category_of_impl<boost_array_tag>
         {
             template<typename T>
             struct apply
diff --git a/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
index c9432c9b..35b1fdbc 100644
--- a/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/end_impl.hpp
@@ -8,11 +8,11 @@
 #if !defined(BOOST_FUSION_END_IMPL_27122005_1120)
 #define BOOST_FUSION_END_IMPL_27122005_1120
 
-#include <boost/fusion/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/boost_array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 
-    struct array_tag;
+    struct boost_array_tag;
 
     namespace extension
     {
@@ -20,7 +20,7 @@ namespace boost { namespace fusion {
         struct end_impl;
 
         template <>
-        struct end_impl<array_tag>
+        struct end_impl<boost_array_tag>
         {
             template <typename Sequence>
             struct apply 
diff --git a/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
index a248c314..9301e81e 100644
--- a/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/is_sequence_impl.hpp
@@ -12,7 +12,7 @@
 
 namespace boost { namespace fusion {
 
-    struct array_tag;
+    struct boost_array_tag;
 
     namespace extension
     {
@@ -20,7 +20,7 @@ namespace boost { namespace fusion {
         struct is_sequence_impl;
 
         template<>
-        struct is_sequence_impl<array_tag>
+        struct is_sequence_impl<boost_array_tag>
         {
             template<typename Sequence>
             struct apply : mpl::true_ {};
diff --git a/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
index bc821fa6..6cb6b36a 100644
--- a/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/is_view_impl.hpp
@@ -12,7 +12,7 @@
 
 namespace boost { namespace fusion 
 {
-    struct array_tag;
+    struct boost_array_tag;
 
     namespace extension
     {
@@ -20,7 +20,7 @@ namespace boost { namespace fusion
         struct is_view_impl;
 
         template<>
-        struct is_view_impl<array_tag>
+        struct is_view_impl<boost_array_tag>
         {
             template<typename T>
             struct apply : mpl::false_
diff --git a/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
index 63661573..87cafdac 100644
--- a/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/size_impl.hpp
@@ -10,7 +10,7 @@
 
 namespace boost { namespace fusion {
 
-    struct array_tag;
+    struct boost_array_tag;
 
     namespace extension
     {
@@ -18,7 +18,7 @@ namespace boost { namespace fusion {
         struct size_impl;
 
         template<>
-        struct size_impl<array_tag>
+        struct size_impl<boost_array_tag>
         {
             template<typename Sequence>
             struct apply : mpl::int_<Sequence::static_size> {};
diff --git a/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp b/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
index f465b1d6..a35abc68 100644
--- a/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
+++ b/include/boost/fusion/adapted/boost_array/detail/value_at_impl.hpp
@@ -10,7 +10,7 @@
 
 namespace boost { namespace fusion {
     
-    struct array_tag;
+    struct boost_array_tag;
 
     namespace extension
     {
@@ -18,7 +18,7 @@ namespace boost { namespace fusion {
         struct value_at_impl;
 
         template <>
-        struct value_at_impl<array_tag>
+        struct value_at_impl<boost_array_tag>
         {
             template <typename Sequence, typename N>
             struct apply 
diff --git a/include/boost/fusion/adapted/boost_array/tag_of.hpp b/include/boost/fusion/adapted/boost_array/tag_of.hpp
index 67a4f116..d38cc804 100644
--- a/include/boost/fusion/adapted/boost_array/tag_of.hpp
+++ b/include/boost/fusion/adapted/boost_array/tag_of.hpp
@@ -20,7 +20,7 @@ namespace boost
 
 namespace boost { namespace fusion 
 {
-    struct array_tag;
+    struct boost_array_tag;
     struct fusion_sequence_tag;
 
     namespace traits
@@ -32,7 +32,7 @@ namespace boost { namespace fusion
         struct tag_of<boost::array<T,N> >
 #endif
         {
-            typedef array_tag type;
+            typedef boost_array_tag type;
         };
     }
 }}