diff --git a/src/core/attribute-test.cc b/src/core/attribute-test.cc
index 6a7a280fd..92efdbe07 100644
--- a/src/core/attribute-test.cc
+++ b/src/core/attribute-test.cc
@@ -459,25 +459,25 @@ AttributeTest::RunTests (void)
 
   m_got1 = -2;
   NS_TEST_ASSERT (p->SetAttributeFailSafe ("IntegerTraceSource1", Integer (-1)));
-  NS_TEST_ASSERT (p->TraceSourceConnect ("Source1", MakeCallback (&AttributeTest::NotifySource1, this)));
+  NS_TEST_ASSERT (p->TraceConnect ("Source1", MakeCallback (&AttributeTest::NotifySource1, this)));
   NS_TEST_ASSERT (p->SetAttributeFailSafe ("IntegerTraceSource1", Integer (0)));
   NS_TEST_ASSERT_EQUAL (m_got1, 0);
-  NS_TEST_ASSERT (p->TraceSourceDisconnect ("Source1", MakeCallback (&AttributeTest::NotifySource1, this)));
+  NS_TEST_ASSERT (p->TraceDisconnect ("Source1", MakeCallback (&AttributeTest::NotifySource1, this)));
   NS_TEST_ASSERT (p->SetAttributeFailSafe ("IntegerTraceSource1", Integer (1)));
   NS_TEST_ASSERT_EQUAL (m_got1, 0);
 
   m_got2 = 4.3;
   p->InvokeCb (1.0, -5, 0.0);
   NS_TEST_ASSERT_EQUAL (m_got2, 4.3);
-  NS_TEST_ASSERT (p->TraceSourceConnect ("Source2", MakeCallback (&AttributeTest::NotifySource2, this)));
+  NS_TEST_ASSERT (p->TraceConnect ("Source2", MakeCallback (&AttributeTest::NotifySource2, this)));
   NS_TEST_ASSERT_EQUAL (m_got2, 4.3);
   p->InvokeCb (1.0, -5, 0.0);
   NS_TEST_ASSERT_EQUAL (m_got2, 1.0);
-  NS_TEST_ASSERT (p->TraceSourceDisconnect ("Source2", MakeCallback (&AttributeTest::NotifySource2, this)));
+  NS_TEST_ASSERT (p->TraceDisconnect ("Source2", MakeCallback (&AttributeTest::NotifySource2, this)));
   p->InvokeCb (-1.0, -5, 0.0);
   NS_TEST_ASSERT_EQUAL (m_got2, 1.0);
 
-  NS_TEST_ASSERT (p->TraceSourceConnect ("ValueSource", MakeCallback (&AttributeTest::NotifySourceValue, this)));
+  NS_TEST_ASSERT (p->TraceConnect ("ValueSource", MakeCallback (&AttributeTest::NotifySourceValue, this)));
   
 
 
diff --git a/src/core/config.cc b/src/core/config.cc
index 4c13f1753..fe490b4ab 100644
--- a/src/core/config.cc
+++ b/src/core/config.cc
@@ -329,7 +329,7 @@ ConfigImpl::Connect (std::string path, const CallbackBase &cb)
 	m_cb (cb) {}
   private:
     virtual void DoOne (Ptr<Object> object, std::string path, std::string name) {
-      object->TraceSourceConnect (name, m_cb);
+      object->TraceConnect (name, m_cb);
     }
     CallbackBase m_cb;
   } resolver = ConnectResolver (path, cb);
@@ -349,7 +349,7 @@ ConfigImpl::Disconnect (std::string path, const CallbackBase &cb)
 	m_cb (cb) {}
   private:
     virtual void DoOne (Ptr<Object> object, std::string path, std::string name) {
-      object->TraceSourceDisconnect (name, m_cb);
+      object->TraceDisconnect (name, m_cb);
     }
     CallbackBase m_cb;
   } resolver = DisconnectResolver (path, cb);
@@ -369,7 +369,7 @@ ConfigImpl::ConnectWithContext (std::string path, const CallbackBase &cb)
 	m_cb (cb) {}
   private:
     virtual void DoOne (Ptr<Object> object, std::string path, std::string name) {
-      object->TraceSourceConnectWithContext (name, path, m_cb);
+      object->TraceConnectWithContext (name, path, m_cb);
     }
     CallbackBase m_cb;
   } resolver = ConnectWithContextResolver (path, cb);
@@ -389,7 +389,7 @@ ConfigImpl::DisconnectWithContext (std::string path, const CallbackBase &cb)
 	m_cb (cb) {}
   private:
     virtual void DoOne (Ptr<Object> object, std::string path, std::string name) {
-      object->TraceSourceDisconnectWithContext (name, path, m_cb);
+      object->TraceDisconnectWithContext (name, path, m_cb);
     }
     CallbackBase m_cb;
   } resolver = DisconnectWithContextResolver (path, cb);
diff --git a/src/core/object.cc b/src/core/object.cc
index e1d442760..759c1db06 100644
--- a/src/core/object.cc
+++ b/src/core/object.cc
@@ -1127,7 +1127,7 @@ Object::GetAttribute (std::string name) const
 }
 
 bool 
-Object::TraceSourceConnect (std::string name, const CallbackBase &cb)
+Object::TraceConnect (std::string name, const CallbackBase &cb)
 {
   Ptr<const TraceSourceAccessor> accessor = m_tid.LookupTraceSourceByName (name);
   if (accessor == 0)
@@ -1138,7 +1138,7 @@ Object::TraceSourceConnect (std::string name, const CallbackBase &cb)
   return ok;
 }
 bool 
-Object::TraceSourceConnectWithContext (std::string name, std::string context, const CallbackBase &cb)
+Object::TraceConnectWithContext (std::string name, std::string context, const CallbackBase &cb)
 {
   Ptr<const TraceSourceAccessor> accessor = m_tid.LookupTraceSourceByName (name);
   if (accessor == 0)
@@ -1149,7 +1149,7 @@ Object::TraceSourceConnectWithContext (std::string name, std::string context, co
   return ok;
 }
 bool 
-Object::TraceSourceDisconnect (std::string name, const CallbackBase &cb)
+Object::TraceDisconnect (std::string name, const CallbackBase &cb)
 {
   Ptr<const TraceSourceAccessor> accessor = m_tid.LookupTraceSourceByName (name);
   if (accessor == 0)
@@ -1160,7 +1160,7 @@ Object::TraceSourceDisconnect (std::string name, const CallbackBase &cb)
   return ok;
 }
 bool 
-Object::TraceSourceDisconnectWithContext (std::string name, std::string context, const CallbackBase &cb)
+Object::TraceDisconnectWithContext (std::string name, std::string context, const CallbackBase &cb)
 {
   Ptr<const TraceSourceAccessor> accessor = m_tid.LookupTraceSourceByName (name);
   if (accessor == 0)
diff --git a/src/core/object.h b/src/core/object.h
index be5c1a785..786094c6f 100644
--- a/src/core/object.h
+++ b/src/core/object.h
@@ -445,10 +445,10 @@ public:
    */
   Attribute GetAttribute (std::string name) const;
 
-  bool TraceSourceConnect (std::string name, const CallbackBase &cb);
-  bool TraceSourceConnectWithContext (std::string name, std::string context, const CallbackBase &cb);
-  bool TraceSourceDisconnect (std::string name, const CallbackBase &cb);
-  bool TraceSourceDisconnectWithContext (std::string name, std::string context, const CallbackBase &cb);
+  bool TraceConnect (std::string name, const CallbackBase &cb);
+  bool TraceConnectWithContext (std::string name, std::string context, const CallbackBase &cb);
+  bool TraceDisconnect (std::string name, const CallbackBase &cb);
+  bool TraceDisconnectWithContext (std::string name, std::string context, const CallbackBase &cb);
 
   TypeId GetRealTypeId (void) const;
 
diff --git a/src/mobility/hierarchical-mobility-model.cc b/src/mobility/hierarchical-mobility-model.cc
index 0ed568beb..fb7d7f359 100644
--- a/src/mobility/hierarchical-mobility-model.cc
+++ b/src/mobility/hierarchical-mobility-model.cc
@@ -58,7 +58,7 @@ HierarchicalMobilityModel::SetChild (Ptr<MobilityModel> model)
       notifier = CreateObject<MobilityModelNotifier> ();
       m_child->AggregateObject (notifier);
     }
-  notifier->TraceSourceConnect ("CourseChange", MakeCallback (&HierarchicalMobilityModel::ChildChanged, this));
+  notifier->TraceConnect ("CourseChange", MakeCallback (&HierarchicalMobilityModel::ChildChanged, this));
 }
 
 void 
@@ -72,7 +72,7 @@ HierarchicalMobilityModel::SetParent (Ptr<MobilityModel> model)
       notifier = CreateObject<MobilityModelNotifier> ();
       m_parent->AggregateObject (notifier);
     }
-  notifier->TraceSourceConnect ("CourseChange", MakeCallback (&HierarchicalMobilityModel::ParentChanged, this));
+  notifier->TraceConnect ("CourseChange", MakeCallback (&HierarchicalMobilityModel::ParentChanged, this));
 }