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