diff --git a/libraries/SITL/SIM_GPS.h b/libraries/SITL/SIM_GPS.h
index 87eafb00c4..f92375f558 100644
--- a/libraries/SITL/SIM_GPS.h
+++ b/libraries/SITL/SIM_GPS.h
@@ -120,7 +120,7 @@ public:
         SBP2  =  9,
 #endif
 #if AP_SIM_GPS_TRIMBLE_ENABLED
-        TRIMBLE  = 11, // matches GPS_TYPE
+        TRIMBLE  = 11, // matches GPS1_TYPE
 #endif
 #if AP_SIM_GPS_MSP_ENABLED
         MSP   = 19,
diff --git a/libraries/SITL/SIM_XPlane.cpp b/libraries/SITL/SIM_XPlane.cpp
index 0f0d9cb457..24af0c6bab 100644
--- a/libraries/SITL/SIM_XPlane.cpp
+++ b/libraries/SITL/SIM_XPlane.cpp
@@ -105,7 +105,7 @@ XPlane::XPlane(const char *frame_str) :
 
     // XPlane sensor data is not good enough for EKF. Use fake EKF by default
     AP_Param::set_default_by_name("AHRS_EKF_TYPE", 10);
-    AP_Param::set_default_by_name("GPS_TYPE", 100);
+    AP_Param::set_default_by_name("GPS1_TYPE", 100);
     AP_Param::set_default_by_name("INS_GYR_CAL", 0);
 
 #if APM_BUILD_TYPE(APM_BUILD_ArduPlane)
diff --git a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
index 32f87f77ea..4a349fd3e7 100644
--- a/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
+++ b/libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
@@ -171,16 +171,16 @@ GPS_AUTO_CONFIG,1
 GPS_AUTO_SWITCH,1
 GPS_BLEND_MASK,5
 GPS_BLEND_TC,10
-GPS_DELAY_MS,0
+GPS1_DELAY_MS,0
 GPS2_DELAY_MS,0
-GPS_GNSS_MODE,0
+GPS1_GNSS_MODE,0
 GPS2_GNSS_MODE,0
 GPS_INJECT_TO,127
 GPS_MIN_ELEV,-100
 GPS_NAVFILTER,8
-GPS_POS_X,0
-GPS_POS_Y,0
-GPS_POS_Z,0
+GPS1_POS_X,0
+GPS1_POS_Y,0
+GPS1_POS_Z,0
 GPS2_POS_X,0
 GPS2_POS_Y,0
 GPS2_POS_Z,0
@@ -190,7 +190,7 @@ GPS_RAW_DATA,0
 GPS_SAVE_CFG,0
 GPS_SBAS_MODE,2
 GPS_SBP_LOGMASK,-32768
-GPS_TYPE,1
+GPS1_TYPE,1
 GPS2_TYPE,0
 GRIP_ENABLE,0
 GROUND_STEER_ALT,0
diff --git a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
index cf435996a1..bfaf562bcf 100644
--- a/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
+++ b/libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
@@ -177,14 +177,14 @@ GPS_BLEND_MASK,5
 GPS_BLEND_TC,10
 GPS_DELAY_MS,0
 GPS2_DELAY_MS,0
-GPS_GNSS_MODE,0
+GPS1_GNSS_MODE,0
 GPS2_GNSS_MODE,0
 GPS_INJECT_TO,127
 GPS_MIN_ELEV,-100
 GPS_NAVFILTER,8
-GPS_POS_X,0
-GPS_POS_Y,0
-GPS_POS_Z,0
+GPS1_POS_X,0
+GPS1_POS_Y,0
+GPS1_POS_Z,0
 GPS2_POS_X,0
 GPS2_POS_Y,0
 GPS2_POS_Z,0
@@ -194,7 +194,7 @@ GPS_RAW_DATA,0
 GPS_SAVE_CFG,0
 GPS_SBAS_MODE,2
 GPS_SBP_LOGMASK,-32768
-GPS_TYPE,1
+GPS1_TYPE,1
 GPS2_TYPE,0
 GRIP_ENABLE,0
 GROUND_STEER_ALT,0