diff --git a/linux/linuxmain.c b/linux/linuxmain.c
index 93fb4fa58..ccad669c9 100644
--- a/linux/linuxmain.c
+++ b/linux/linuxmain.c
@@ -805,7 +805,7 @@ main( int argc, char** argv )
     LaunchParams mainParams;
     XP_U16 robotCount = 0;
     
-    CommsConnType conType = COMMS_CONN_UNUSED;
+    CommsConnType conType = COMMS_CONN_NONE;
 #ifdef XWFEATURE_BLUETOOTH
     const char* btaddr = NULL;
 #endif
@@ -901,14 +901,14 @@ main( int argc, char** argv )
             break;
 #ifdef XWFEATURE_RELAY
         case 'C':
-            XP_ASSERT( conType == COMMS_CONN_UNUSED ||
+            XP_ASSERT( conType == COMMS_CONN_NONE ||
                        conType == COMMS_CONN_RELAY );
             mainParams.connInfo.relay.cookie = optarg;
             conType = COMMS_CONN_RELAY;
             break;
 #endif
         case 'D':
-            XP_ASSERT( conType == COMMS_CONN_UNUSED ||
+            XP_ASSERT( conType == COMMS_CONN_NONE ||
                        conType == COMMS_CONN_IP_DIRECT );
             hostName = optarg;
             conType = COMMS_CONN_IP_DIRECT;
@@ -980,7 +980,7 @@ main( int argc, char** argv )
             break;
         case 'a':
             /* mainParams.info.clientInfo.serverName =  */
-            XP_ASSERT( conType == COMMS_CONN_UNUSED ||
+            XP_ASSERT( conType == COMMS_CONN_NONE ||
                        conType == COMMS_CONN_RELAY );
             conType = COMMS_CONN_RELAY;
             hostName = optarg;
@@ -993,7 +993,7 @@ main( int argc, char** argv )
             break;
 #ifdef XWFEATURE_BLUETOOTH
         case 'B':
-            XP_ASSERT( conType == COMMS_CONN_UNUSED ||
+            XP_ASSERT( conType == COMMS_CONN_NONE ||
                        conType == COMMS_CONN_BT );
             conType = COMMS_CONN_BT;
             btaddr = optarg;
diff --git a/wince/cecondlg.c b/wince/cecondlg.c
index 080f873b2..de97c4486 100755
--- a/wince/cecondlg.c
+++ b/wince/cecondlg.c
@@ -111,7 +111,7 @@ conTypeToIndex( CommsConnType conType )
 static CommsConnType
 indexToConType( XP_U16 index )
 {
-    CommsConnType conType = COMMS_CONN_UNUSED;
+    CommsConnType conType = COMMS_CONN_NONE;
     switch( index ) {
     case 0:
         conType = COMMS_CONN_BT; break;