--- a/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java	Fri Feb 05 07:42:52 2010 -0600
+++ b/connectivity/com.nokia.carbide.remoteConnections/src/com/nokia/carbide/remoteconnections/settings/ui/ConnectionSettingsPage.java	Fri Feb 05 09:51:33 2010 -0600
@@ -78,7 +78,7 @@
 
 import com.nokia.carbide.remoteconnections.Messages;
 import com.nokia.carbide.remoteconnections.RemoteConnectionsActivator;
-import com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService;
+import com.nokia.carbide.remoteconnections.interfaces.AbstractConnectedService2;
 import com.nokia.carbide.remoteconnections.interfaces.IConnectedService;
 import com.nokia.carbide.remoteconnections.interfaces.IConnection;
 import com.nokia.carbide.remoteconnections.interfaces.IConnectionFactory;
@@ -105,12 +105,12 @@
 	public final class Tester extends Thread {
 		@Override
 		public void run() {
-			((AbstractConnectedService) connectedService).setManualTesting();
+			((AbstractConnectedService2) connectedService).setExternalTesting();
 			for (int i = 0; i < 3 && connectedService != null; i++) {
 				connectedService.testStatus();
 				try {
 					if (i < 2)
-						sleep(AbstractConnectedService.TIMEOUT);
+						sleep(AbstractConnectedService2.TIMEOUT);
 				} catch (InterruptedException e) {
 					break;
 				}
@@ -678,8 +678,8 @@
 					});
 				}
 			});
-			if (connectedService instanceof AbstractConnectedService) {
-				((AbstractConnectedService) connectedService).setRunnableContext(getContainer());
+			if (connectedService instanceof AbstractConnectedService2) {
+				((AbstractConnectedService2) connectedService).setRunnableContext(getContainer());
 				tester = new Tester();
 				tester.start();
 			}