--- a/src/core/config.cc	Tue Mar 11 13:30:12 2008 -0700
+++ b/src/core/config.cc	Tue Mar 11 13:34:29 2008 -0700
@@ -329,7 +329,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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);