diff --git a/src/common/data-rate.h b/src/common/data-rate.h
index 9cad5d413..3ebdbeaab 100644
--- a/src/common/data-rate.h
+++ b/src/common/data-rate.h
@@ -93,7 +93,7 @@ std::istream &operator >> (std::istream &is, DataRate &rate);
  * \brief hold objects of type ns3::DataRate
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (DataRate);
+ATTRIBUTE_HELPER_HEADER (DataRate);
 
 /**
  * \param lhs
diff --git a/src/core/attribute-helper.h b/src/core/attribute-helper.h
index 2757145fc..7e86578a5 100644
--- a/src/core/attribute-helper.h
+++ b/src/core/attribute-helper.h
@@ -238,7 +238,7 @@ MakeSimpleAttributeChecker (std::string name, std::string underlying)
  * This macro should be invoked outside of the class
  * declaration in its public header.
  */
-#define ATTRIBUTE_HELPER_HEADER_2(type)					\
+#define ATTRIBUTE_HELPER_HEADER(type)					\
   ATTRIBUTE_VALUE_DEFINE (type);					\
   ATTRIBUTE_ACCESSOR_DEFINE (type);					\
   ATTRIBUTE_CHECKER_DEFINE (type);
diff --git a/src/core/attribute-test.cc b/src/core/attribute-test.cc
index e1c694a3d..64eee0837 100644
--- a/src/core/attribute-test.cc
+++ b/src/core/attribute-test.cc
@@ -53,7 +53,7 @@ std::istream & operator >> (std::istream &is, ValueClassTest &v)
 {
   return is;
 }
-ATTRIBUTE_HELPER_HEADER_2 (ValueClassTest);
+ATTRIBUTE_HELPER_HEADER (ValueClassTest);
 ATTRIBUTE_HELPER_CPP (ValueClassTest);
 
 class AttributeTest : public Test
diff --git a/src/core/object-factory.h b/src/core/object-factory.h
index 4161af14b..01f9341ed 100644
--- a/src/core/object-factory.h
+++ b/src/core/object-factory.h
@@ -93,7 +93,7 @@ std::istream & operator >> (std::istream &is, ObjectFactory &factory);
  * \brief hold objects of type ns3::ObjectFactory
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (ObjectFactory);
+ATTRIBUTE_HELPER_HEADER (ObjectFactory);
 
 } // namespace ns3
 
diff --git a/src/core/type-id.h b/src/core/type-id.h
index 09555a4ea..48455f06f 100644
--- a/src/core/type-id.h
+++ b/src/core/type-id.h
@@ -387,7 +387,7 @@ bool operator <  (TypeId a, TypeId b);
  */
 
 
-ATTRIBUTE_HELPER_HEADER_2 (TypeId);
+ATTRIBUTE_HELPER_HEADER (TypeId);
 
 } // namespace ns3 
 
diff --git a/src/devices/wifi/ssid.h b/src/devices/wifi/ssid.h
index 9da9900b6..dc47e0787 100644
--- a/src/devices/wifi/ssid.h
+++ b/src/devices/wifi/ssid.h
@@ -62,7 +62,7 @@ std::istream &operator >> (std::istream &is, Ssid &ssid);
  * \brief hold objects of type ns3::Ssid
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Ssid);
+ATTRIBUTE_HELPER_HEADER (Ssid);
 
 } // namespace ns3
 
diff --git a/src/devices/wifi/wifi-mode.h b/src/devices/wifi/wifi-mode.h
index 507240485..24ea1163d 100644
--- a/src/devices/wifi/wifi-mode.h
+++ b/src/devices/wifi/wifi-mode.h
@@ -122,7 +122,7 @@ std::istream & operator >> (std::istream &is, WifiMode &mode);
  * \brief hold objects of type ns3::WifiMode
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (WifiMode);
+ATTRIBUTE_HELPER_HEADER (WifiMode);
 
 /**
  * \brief create WifiMode class instances and keep track of them.
diff --git a/src/mobility/rectangle.h b/src/mobility/rectangle.h
index b60708052..d49d5365b 100644
--- a/src/mobility/rectangle.h
+++ b/src/mobility/rectangle.h
@@ -71,7 +71,7 @@ std::istream &operator >> (std::istream &is, Rectangle &rectangle);
  * \brief hold objects of type ns3::Rectangle
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Rectangle);
+ATTRIBUTE_HELPER_HEADER (Rectangle);
 
 } // namespace ns3
 
diff --git a/src/mobility/vector.h b/src/mobility/vector.h
index 30bed8dc0..4bf1716d3 100644
--- a/src/mobility/vector.h
+++ b/src/mobility/vector.h
@@ -66,7 +66,7 @@ double CalculateDistance (const Vector &a, const Vector &b);
  * \brief hold objects of type ns3::Vector
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Vector);
+ATTRIBUTE_HELPER_HEADER (Vector);
 
 std::ostream &operator << (std::ostream &os, const Vector &vector);
 std::istream &operator >> (std::istream &is, Vector &vector);
diff --git a/src/node/address.h b/src/node/address.h
index b49c14bac..0efa67134 100644
--- a/src/node/address.h
+++ b/src/node/address.h
@@ -170,7 +170,7 @@ private:
  * \brief hold objects of type ns3::Address
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Address);
+ATTRIBUTE_HELPER_HEADER (Address);
 
 bool operator == (const Address &a, const Address &b);
 bool operator != (const Address &a, const Address &b);
diff --git a/src/node/ipv4-address.h b/src/node/ipv4-address.h
index c88910966..62999fc03 100644
--- a/src/node/ipv4-address.h
+++ b/src/node/ipv4-address.h
@@ -192,8 +192,8 @@ private:
  * \brief hold objects of type ns3::Ipv4Mask
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Ipv4Address);
-ATTRIBUTE_HELPER_HEADER_2 (Ipv4Mask);
+ATTRIBUTE_HELPER_HEADER (Ipv4Address);
+ATTRIBUTE_HELPER_HEADER (Ipv4Mask);
 
 std::ostream& operator<< (std::ostream& os, Ipv4Address const& address);
 std::ostream& operator<< (std::ostream& os, Ipv4Mask const& mask);
diff --git a/src/node/mac48-address.h b/src/node/mac48-address.h
index e1f42e071..75c356a8e 100644
--- a/src/node/mac48-address.h
+++ b/src/node/mac48-address.h
@@ -116,7 +116,7 @@ private:
  * \brief hold objects of type ns3::Mac48Address
  */
 
-ATTRIBUTE_HELPER_HEADER_2 (Mac48Address);
+ATTRIBUTE_HELPER_HEADER (Mac48Address);
 
 bool operator == (const Mac48Address &a, const Mac48Address &b);
 bool operator != (const Mac48Address &a, const Mac48Address &b);