--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IConnectionsManager.java	Fri Dec 18 07:45:51 2009 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/interfaces/IConnectionsManager.java	Fri Dec 18 09:17:36 2009 -0600
@@ -23,6 +23,8 @@
 
 import org.eclipse.core.runtime.CoreException;
 
+import com.nokia.carbide.remoteconnections.internal.api.IConnection2;
+
 /**
  * An interface encapsulating the manager of connection objects
  * @noimplement
@@ -184,17 +186,17 @@
 	 * If a dynamic connection is disconnected, it is transitioned to a disconnected state while it
 	 * is in use by some client service, and is eventually removed from the system once it is 
 	 * no longer in use. 
-	 * @param connection IConnection
+	 * @param connection IConnection2
 	 * @since 3.0
 	 */
-	void disconnect(IConnection connection);
+	void disconnect(IConnection2 connection);
 	
 	/**
 	 * Attempts to set a disconnected dynamic connection back to its in-use state. 
 	 * If the connection has not been removed from the system, and is still in-use, 
 	 * it will be restored. Returns true if successful in restoring the connection.
-	 * @param connection IConnection
+	 * @param connection IConnection2
 	 * @since 3.0
 	 */
-	boolean reconnect(IConnection connection);
+	boolean reconnect(IConnection2 connection);
 }
\ No newline at end of file

--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Fri Dec 18 07:45:51 2009 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/internal/registry/Registry.java	Fri Dec 18 09:17:36 2009 -0600
@@ -534,14 +534,15 @@
 		return defaultConnection;
 	}
 
-	public void disconnect(IConnection connection) {
+	public void disconnect(IConnection2 connection) {
+		
 		// TODO transition to disconnected state and wait:
 		// if not in-use, remove and stop waiting
 		// if reconnected, stop waiting
 		
 	}
 
-	public boolean reconnect(IConnection connection) {
+	public boolean reconnect(IConnection2 connection) {
 		// TODO if not removed, transition out of disconnected state
 		// return not removed
 		return false;