diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c
index fe6b96d49..c92931a17 100644
--- a/sc2/src/sc2code/comm.c
+++ b/sc2/src/sc2code/comm.c
@@ -1444,9 +1444,9 @@ InitCommunication (CONVERSATION which_comm)
 		}
 	}
 
-	if (which_comm == URQUAN_PROBE_CONVERSATION)
+	if (which_comm == URQUAN_DRONE_CONVERSATION)
 	{
-		status = URQUAN_PROBE_SHIP;
+		status = URQUAN_DRONE_SHIP;
 		which_comm = URQUAN_CONVERSATION;
 	}
 	else
diff --git a/sc2/src/sc2code/commglue.h b/sc2/src/sc2code/commglue.h
index 4eccaace7..47cf2d99b 100644
--- a/sc2/src/sc2code/commglue.h
+++ b/sc2/src/sc2code/commglue.h
@@ -48,7 +48,7 @@ typedef enum {
 	BLACKURQ_CONVERSATION,
 	TALKING_PET_CONVERSATION,
 	SLYLANDRO_HOME_CONVERSATION,
-	URQUAN_PROBE_CONVERSATION,
+	URQUAN_DRONE_CONVERSATION,
 	YEHAT_REBEL_CONVERSATION,
 	INVALID_CONVERSATION,
 } CONVERSATION;
diff --git a/sc2/src/sc2code/ipdisp.c b/sc2/src/sc2code/ipdisp.c
index 6f6f3c7cb..f75966249 100644
--- a/sc2/src/sc2code/ipdisp.c
+++ b/sc2/src/sc2code/ipdisp.c
@@ -184,7 +184,7 @@ ip_group_preprocess (ELEMENT *ElementPtr)
 			if (group_loc != 0) /* if in planetary views */
 			{
 				detect_dist *= (MAX_ZOOM_RADIUS / MIN_ZOOM_RADIUS);
-				if (GroupPtr->race_id == URQUAN_PROBE_SHIP)
+				if (GroupPtr->race_id == URQUAN_DRONE_SHIP)
 					detect_dist <<= 1;
 			}
 			vdx = GLOBAL (ip_location.x) - GroupPtr->loc.x;
@@ -545,7 +545,7 @@ ip_group_collision (ELEMENT *ElementPtr0, POINT *pPt0,
 	{
 		EncounterGroup = GroupPtr->group_id;
 
-		if (GroupPtr->race_id == URQUAN_PROBE_SHIP)
+		if (GroupPtr->race_id == URQUAN_DRONE_SHIP)
 		{
 			GroupPtr->task = FLEE | IGNORE_FLAGSHIP;
 			GroupPtr->dest_loc = 0;
diff --git a/sc2/src/sc2code/planets/gensol.c b/sc2/src/sc2code/planets/gensol.c
index e458f8c50..988080c25 100644
--- a/sc2/src/sc2code/planets/gensol.c
+++ b/sc2/src/sc2code/planets/gensol.c
@@ -413,7 +413,7 @@ GenerateSOL (BYTE control)
 					GET_GAME_STATE_32 (URQUAN_PROBE_GRPOFFS0);
 			if (GLOBAL (BattleGroupRef) == 0)
 			{
-				CloneShipFragment (URQUAN_PROBE_SHIP,
+				CloneShipFragment (URQUAN_DRONE_SHIP,
 						&GLOBAL (npc_built_ship_q), 0);
 				GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
 				ReinitQueue (&GLOBAL (npc_built_ship_q));
diff --git a/sc2/src/sc2code/races.h b/sc2/src/sc2code/races.h
index fc2b63a78..f92f5e061 100644
--- a/sc2/src/sc2code/races.h
+++ b/sc2/src/sc2code/races.h
@@ -392,8 +392,8 @@ enum
 	SYREEN_SHIP,
 	BLACK_URQUAN_SHIP,
 	YEHAT_REBEL_SHIP,
-	URQUAN_PROBE_SHIP,
-	SAMATRA_SHIP = URQUAN_PROBE_SHIP,
+	URQUAN_DRONE_SHIP,
+	SAMATRA_SHIP = URQUAN_DRONE_SHIP,
 
 	NUM_AVAILABLE_RACES
 };
@@ -422,7 +422,7 @@ enum
 		INVALID_CONVERSATION,      /* SYREEN_SHIP */ \
 		BLACKURQ_CONVERSATION,     /* BLACK_URQUAN_SHIP */ \
 		YEHAT_REBEL_CONVERSATION,  /* YEHAT_REBEL_SHIP */ \
-		URQUAN_PROBE_CONVERSATION, /* URQUAN_PROBE_SHIP */
+		URQUAN_DRONE_CONVERSATION, /* URQUAN_DRONE_SHIP */
 
 #define RACE_SHIP_FOR_COMM \
 	ARILOU_SHIP,       /* ARILOU_CONVERSATION */ \
@@ -449,7 +449,7 @@ enum
 	BLACK_URQUAN_SHIP, /* BLACKURQ_CONVERSATION */ \
 	UMGAH_SHIP,        /* TALKING_PET_CONVERSATION */ \
 	SLYLANDRO_SHIP,    /* SLYLANDRO_HOME_CONVERSATION */ \
-	URQUAN_PROBE_SHIP, /* URQUAN_PROBE_CONVERSATION */ \
+	URQUAN_DRONE_SHIP, /* URQUAN_DRONE_CONVERSATION */ \
 	YEHAT_SHIP,        /* YEHAT_REBEL_CONVERSATION */ \
 	HUMAN_SHIP         /* INVALID_CONVERSATION */
  
@@ -503,7 +503,7 @@ enum
 		LOG_TO_IP (36),  /* SYREEN_SHIP */ \
 		LOG_TO_IP (30),  /* BLACK_URQUAN_SHIP */ \
 		LOG_TO_IP (30),  /* YEHAT_REBEL_SHIP */ \
-		LOG_TO_IP (90),  /* URQUAN_PROBE_SHIP */
+		LOG_TO_IP (90),  /* URQUAN_DRONE_SHIP */
 
 #define LOG_TO_HYPER(s) (WORLD_TO_VELOCITY (s) >> 1)
 #define RACE_HYPER_SPEED \
@@ -555,7 +555,7 @@ enum
 		 0,  /* SYREEN_SHIP */ \
 		70,  /* BLACK_URQUAN_SHIP */ \
 		60,  /* YEHAT_REBEL_SHIP */ \
-		 0,  /* URQUAN_PROBE_SHIP */
+		 0,  /* URQUAN_DRONE_SHIP */
 
 #define RACE_INTERPLANETARY_PERCENT \
 		 0,  /* ARILOU_SHIP */ \
@@ -581,7 +581,7 @@ enum
 		 0,  /* SYREEN_SHIP */ \
 		40,  /* BLACK_URQUAN_SHIP */ \
 		40,  /* YEHAT_REBEL_SHIP */ \
-		 0,  /* URQUAN_PROBE_SHIP */
+		 0,  /* URQUAN_DRONE_SHIP */
 
 // How many ships will an encounter consist of.
 // The first number specifies the minimum, the second the maximum.