--- a/src/core/model/type-id.cc	Wed Aug 03 10:04:56 2011 -0400
+++ b/src/core/model/type-id.cc	Wed Aug 03 10:08:47 2011 -0400
@@ -618,12 +618,6 @@
   return Singleton<IidManager>::Get ()->GetAttribute(m_tid, i);
 }
 std::string 
-TypeId::GetAttributeName (uint32_t i) const
-{
-  std::string name = Singleton<IidManager>::Get ()->GetAttributeName (m_tid, i);
-  return name;
-}
-std::string 
 TypeId::GetAttributeHelp (uint32_t i) const
 {
   std::string help = Singleton<IidManager>::Get ()->GetAttributeHelp (m_tid, i);
@@ -632,7 +626,8 @@
 std::string 
 TypeId::GetAttributeFullName (uint32_t i) const
 {
-  return GetName () + "::" + GetAttributeName (i);
+  struct TypeId::AttributeInformation info = GetAttribute(i);
+  return GetName () + "::" + info.name;
 }
 Ptr<const AttributeValue>
 TypeId::GetAttributeInitialValue (uint32_t i) const

--- a/src/core/model/type-id.h	Wed Aug 03 10:04:56 2011 -0400
+++ b/src/core/model/type-id.h	Wed Aug 03 10:08:47 2011 -0400
@@ -152,12 +152,6 @@
    */
   struct TypeId::AttributeInformation GetAttribute(uint32_t i) const;
   /**
-   * \param i index into attribute array
-   * \returns the name associated to the attribute whose
-   *          index is i.
-   */
-  std::string GetAttributeName (uint32_t i) const;
-  /**
    * \param i index into attribute array.
    * \returns the help text associated to the attribute whose
    *          index is i.

--- a/utils/print-introspected-doxygen.cc	Wed Aug 03 10:04:56 2011 -0400
+++ b/utils/print-introspected-doxygen.cc	Wed Aug 03 10:08:47 2011 -0400
@@ -384,7 +384,8 @@
 		<< "<ul>" << std::endl;
       for (uint32_t j = 0; j < tid.GetAttributeN (); ++j)
 	{
-	  std::cout << "<li>" << tid.GetAttributeName (j) << ": " << tid.GetAttributeHelp (j) << "</li>" << std::endl;
+	  struct TypeId::AttributeInformation info = tid.GetAttribute(j);
+	  std::cout << "<li>" << info.name << ": " << info.help << "</li>" << std::endl;
 	}
       std::cout << "</ul>" << std::endl;
     }