--- a/src/core/model/object-base.cc	Wed Aug 03 09:42:10 2011 -0400
+++ b/src/core/model/object-base.cc	Wed Aug 03 10:04:56 2011 -0400
@@ -158,14 +158,14 @@
 }
 
 bool
-ObjectBase::DoSet (Ptr<const AttributeAccessor> spec, 
+ObjectBase::DoSet (Ptr<const AttributeAccessor> accessor, 
                    Ptr<const AttributeChecker> checker,
                    const AttributeValue &value)
 {
   bool ok = checker->Check (value);
   if (ok)
     {
-      ok = spec->Set (this, value);
+      ok = accessor->Set (this, value);
       return ok;
     }
   // attempt to convert to string
@@ -186,13 +186,13 @@
     {
       return false;
     }
-  ok = spec->Set (this, *v);
+  ok = accessor->Set (this, *v);
   return ok;
 }
 void
 ObjectBase::SetAttribute (std::string name, const AttributeValue &value)
 {
-  struct TypeId::AttributeInfo info;
+  struct TypeId::AttributeInformation info;
   TypeId tid = GetInstanceTypeId ();
   if (!tid.LookupAttributeByName (name, &info))
     {
@@ -211,7 +211,7 @@
 bool 
 ObjectBase::SetAttributeFailSafe (std::string name, const AttributeValue &value)
 {
-  struct TypeId::AttributeInfo info;
+  struct TypeId::AttributeInformation info;
   TypeId tid = GetInstanceTypeId ();
   if (!tid.LookupAttributeByName (name, &info))
     {
@@ -228,7 +228,7 @@
 void
 ObjectBase::GetAttribute (std::string name, AttributeValue &value) const
 {
-  struct TypeId::AttributeInfo info;
+  struct TypeId::AttributeInformation info;
   TypeId tid = GetInstanceTypeId ();
   if (!tid.LookupAttributeByName (name, &info))
     {
@@ -262,7 +262,7 @@
 bool
 ObjectBase::GetAttributeFailSafe (std::string name, AttributeValue &value) const
 {
-  struct TypeId::AttributeInfo info;
+  struct TypeId::AttributeInformation info;
   TypeId tid = GetInstanceTypeId ();
   if (!tid.LookupAttributeByName (name, &info))
     {