--- a/src/core/config.h	Tue Mar 11 13:34:29 2008 -0700
+++ b/src/core/config.h	Tue Mar 11 13:46:22 2008 -0700
@@ -78,14 +78,14 @@
  * match the input path and will then connect the input callback
  * to them.
  */
-void Connect (std::string path, const CallbackBase &cb);
+void ConnectWithoutContext (std::string path, const CallbackBase &cb);
 /**
  * \param path a path to match trace sources.
  * \param cb the callback to disconnect to the matching trace sources.
  *
  * This function undoes the work of Config::Connect.
  */
-void Disconnect (std::string path, const CallbackBase &cb);
+void DisconnectWithoutContext (std::string path, const CallbackBase &cb);
 /**
  * \param path a path to match trace sources.
  * \param cb the callback to connect to the matching trace sources.
@@ -95,14 +95,14 @@
  * to them in such a way that the callback will receive an extra
  * context string upon trace event notification.
  */
-void ConnectWithContext (std::string path, const CallbackBase &cb);
+void Connect (std::string path, const CallbackBase &cb);
 /**
  * \param path a path to match trace sources.
  * \param cb the callback to connect to the matching trace sources.
  *
  * This function undoes the work of Config::ConnectWithContext.
  */
-void DisconnectWithContext (std::string path, const CallbackBase &cb);
+void Disconnect (std::string path, const CallbackBase &cb);
 
 /**
  * \param obj a new root object