diff --git a/conf/airframes/CDW/ChimuLisaFw.xml b/conf/airframes/CDW/ChimuLisaFw.xml
index 0e2fef40aa..812d8ed402 100644
--- a/conf/airframes/CDW/ChimuLisaFw.xml
+++ b/conf/airframes/CDW/ChimuLisaFw.xml
@@ -196,7 +196,7 @@
     <subsystem name="control"/>
     <!-- Sensors 
     <subsystem name="gyro"          type="roll"/> -->
-    <subsystem name="gps" 		    type="ublox_lea4p"/>
+    <subsystem name="gps" 		    type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/CDW/ChimuTinyFw.xml b/conf/airframes/CDW/ChimuTinyFw.xml
index 239d3ecace..d1d6271509 100644
--- a/conf/airframes/CDW/ChimuTinyFw.xml
+++ b/conf/airframes/CDW/ChimuTinyFw.xml
@@ -176,7 +176,7 @@
     <target name="sim" board="pc"/>
 
     <subsystem name="radio_control" type="ppm"/>
-    <subsystem name="gps" type="ublox_lea5h" >
+    <subsystem name="gps" type="ublox" >
       <configure name="GPS_PORT" value="gps_i2c" />
     </subsystem>
 
@@ -189,7 +189,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="navigation"/>
-<!--    <subsystem name="gps"    type="ublox_lea5h"/> -->
+<!--    <subsystem name="gps"    type="ublox"/> -->
 
     <!--<subsystem name="i2c"/>-->
 
diff --git a/conf/airframes/CDW/ChimuTinyFwSpi.xml b/conf/airframes/CDW/ChimuTinyFwSpi.xml
index f144a138e5..6d10394322 100644
--- a/conf/airframes/CDW/ChimuTinyFwSpi.xml
+++ b/conf/airframes/CDW/ChimuTinyFwSpi.xml
@@ -175,7 +175,7 @@
     <target name="sim" board="pc"/>
 
     <subsystem name="radio_control" type="ppm"/>
-    <subsystem name="gps" type="ublox_lea5h" />
+    <subsystem name="gps" type="ublox" />
 
     <!-- Communication -->
     <subsystem name="telemetry" type="xbee_api">
@@ -186,7 +186,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="navigation"/>
-<!--    <subsystem name="gps"    type="ublox_lea5h"/> -->
+<!--    <subsystem name="gps"    type="ublox"/> -->
 
     <subsystem name="spi_slave_hs"/>
 
diff --git a/conf/airframes/CDW/LisaFw.xml b/conf/airframes/CDW/LisaFw.xml
index 15baa30976..37cb8df3ea 100644
--- a/conf/airframes/CDW/LisaFw.xml
+++ b/conf/airframes/CDW/LisaFw.xml
@@ -200,7 +200,7 @@
       <configure name="ADC_IR_NB_SAMPLES" value="16"/>
     </subsystem>-->
 
-    <subsystem name="gps" 		type="ublox_lea4p">
+    <subsystem name="gps" 		type="ublox_utm">
       <configure name="GPS_PORT"		value="UART1"/>
     </subsystem>
 
diff --git a/conf/airframes/CDW/TinyFw.xml b/conf/airframes/CDW/TinyFw.xml
index 160460fe9a..31523ce721 100644
--- a/conf/airframes/CDW/TinyFw.xml
+++ b/conf/airframes/CDW/TinyFw.xml
@@ -187,7 +187,7 @@
     <!-- Sensors -->
     <subsystem name="gyro"      type="roll"/>
     <subsystem name="attitude"  type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea4p"/>
+    <subsystem name="gps" 		type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/ENAC/fixed-wing/funjet2.xml b/conf/airframes/ENAC/fixed-wing/funjet2.xml
index a10debf64c..b1b5b3861d 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2.xml
@@ -49,7 +49,7 @@
     <!-- Actuators are automatically chosen according to board-->
     <subsystem name="control"/>
     <!-- Sensors -->
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
     <subsystem name="gyro" type="roll">
       <configure name="ADC_GYRO_ROLL" value="ADC_5"/>
     </subsystem>
diff --git a/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml b/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
index b02cd6ec66..c7e177da46 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2_nc.xml
@@ -47,7 +47,7 @@
     <!-- Actuators are automatically chosen according to board-->
     <subsystem name="control" type="new"/>
     <!-- Sensors -->
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
     <subsystem name="gyro" type="roll">
       <configure name="ADC_GYRO_ROLL" value="ADC_5"/>
     </subsystem>
diff --git a/conf/airframes/ENAC/fixed-wing/funjet2_new.xml b/conf/airframes/ENAC/fixed-wing/funjet2_new.xml
index 83436e97ef..f1edbb278c 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet2_new.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet2_new.xml
@@ -47,7 +47,7 @@
     <!-- Actuators are automatically chosen according to board-->
     <subsystem name="control" type="new"/>
     <!-- Sensors -->
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
     <subsystem name="gyro" type="roll">
       <configure name="ADC_GYRO_ROLL" value="ADC_5"/>
     </subsystem>
diff --git a/conf/airframes/ENAC/fixed-wing/funjet3.xml b/conf/airframes/ENAC/fixed-wing/funjet3.xml
index f82437175f..40fe027ca5 100644
--- a/conf/airframes/ENAC/fixed-wing/funjet3.xml
+++ b/conf/airframes/ENAC/fixed-wing/funjet3.xml
@@ -49,7 +49,7 @@
     <subsystem name="control" type="new"/>
     <subsystem name="navigation"/>
     <!-- Sensors -->
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
   </firmware>
 
 
diff --git a/conf/airframes/ENAC/fixed-wing/merlin.xml b/conf/airframes/ENAC/fixed-wing/merlin.xml
index 2ab3b975ac..17d65550e7 100644
--- a/conf/airframes/ENAC/fixed-wing/merlin.xml
+++ b/conf/airframes/ENAC/fixed-wing/merlin.xml
@@ -20,7 +20,7 @@
     <subsystem name="telemetry"     type="transparent"/>
     <subsystem name="control"/>
     <!--subsystem name="attitude"      type="infrared"/-->
-    <subsystem name="gps"           type="ublox_lea5h"/>
+    <subsystem name="gps"           type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/ENAC/fixed-wing/minimag1.xml b/conf/airframes/ENAC/fixed-wing/minimag1.xml
index 714f48dc14..4235bd68c9 100644
--- a/conf/airframes/ENAC/fixed-wing/minimag1.xml
+++ b/conf/airframes/ENAC/fixed-wing/minimag1.xml
@@ -26,7 +26,7 @@
     <subsystem name="navigation" />
 <!--    <subsystem name="attitude" type="infrared"/>-->
     <subsystem name="control"/>
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
   </firmware>
 
   <firmware name="setup">
diff --git a/conf/airframes/ENAC/fixed-wing/spocIII-1.xml b/conf/airframes/ENAC/fixed-wing/spocIII-1.xml
index 1ed5c98946..f1ed87e6be 100644
--- a/conf/airframes/ENAC/fixed-wing/spocIII-1.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocIII-1.xml
@@ -34,7 +34,7 @@
     <!-- Actuators are automatically chosen according to board-->
     <subsystem name="control"/>
     <!-- Sensors -->
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
 
     <!--subsystem name="current_sensor">
       <configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
diff --git a/conf/airframes/ENAC/fixed-wing/spocIII-2.xml b/conf/airframes/ENAC/fixed-wing/spocIII-2.xml
index dd089d566e..4332ecacd8 100644
--- a/conf/airframes/ENAC/fixed-wing/spocIII-2.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocIII-2.xml
@@ -42,7 +42,7 @@
     <subsystem name="radio_control" type="datalink"/>
 
     <!-- Sensors -->
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
 
     <!--subsystem name="current_sensor">
       <configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
diff --git a/conf/airframes/ENAC/fixed-wing/spocIII-3.xml b/conf/airframes/ENAC/fixed-wing/spocIII-3.xml
index ec49f92e65..cfc617b9a1 100644
--- a/conf/airframes/ENAC/fixed-wing/spocIII-3.xml
+++ b/conf/airframes/ENAC/fixed-wing/spocIII-3.xml
@@ -43,7 +43,7 @@
     <subsystem name="radio_control" type="datalink"/>
 
     <!-- Sensors -->
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
 
     <subsystem name="current_sensor">
       <configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
diff --git a/conf/airframes/ENAC/fixed-wing/twinjet2.xml b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
index c118819f03..c4881fe2b3 100644
--- a/conf/airframes/ENAC/fixed-wing/twinjet2.xml
+++ b/conf/airframes/ENAC/fixed-wing/twinjet2.xml
@@ -34,7 +34,7 @@
     <subsystem name="telemetry"     type="xbee_api"/>
     <subsystem name="control"       type="new"/>
     <subsystem name="attitude"      type="infrared"/>
-    <subsystem name="gps"           type="ublox_lea5h"/>
+    <subsystem name="gps"           type="ublox"/>
     <subsystem name="navigation"/>
     <subsystem name="i2c"/>
   </firmware>
diff --git a/conf/airframes/LAAS/mmlaas_N1.xml b/conf/airframes/LAAS/mmlaas_N1.xml
index 59cacc5ea6..80e16b86ce 100644
--- a/conf/airframes/LAAS/mmlaas_N1.xml
+++ b/conf/airframes/LAAS/mmlaas_N1.xml
@@ -28,7 +28,7 @@
       <configure name="ADC_IR2" value="ADC_0"/>
       <configure name="ADC_IR_TOP" value="ADC_2"/>
     </subsystem>
-    <subsystem name="gps" 		    type="ublox_lea4p"/>
+    <subsystem name="gps" 		    type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/LAAS/mmlaas_N2.xml b/conf/airframes/LAAS/mmlaas_N2.xml
index 018c4551cf..134dfba4ed 100644
--- a/conf/airframes/LAAS/mmlaas_N2.xml
+++ b/conf/airframes/LAAS/mmlaas_N2.xml
@@ -28,7 +28,7 @@
       <configure name="ADC_IR2" value="ADC_1"/>
       <configure name="ADC_IR_TOP" value="ADC_2"/>
     </subsystem>
-    <subsystem name="gps" 		    type="ublox_lea4p"/>
+    <subsystem name="gps" 		    type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/LAAS/mmlaas_N3.xml b/conf/airframes/LAAS/mmlaas_N3.xml
index 5f75acae18..515b5179ad 100644
--- a/conf/airframes/LAAS/mmlaas_N3.xml
+++ b/conf/airframes/LAAS/mmlaas_N3.xml
@@ -28,7 +28,7 @@
       <configure name="ADC_IR2" value="ADC_1"/>
       <configure name="ADC_IR_TOP" value="ADC_2"/>
     </subsystem>
-    <subsystem name="gps" 		    type="ublox_lea4p"/>
+    <subsystem name="gps" 		    type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml b/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
index e27ed4dde5..c61e31f6b4 100644
--- a/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
+++ b/conf/airframes/PPZUAV/fixed-wing/ppzimu_tiny.xml
@@ -260,7 +260,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="navigation"/>
-    <subsystem name="gps" type="ublox_lea4p"/>
+    <subsystem name="gps" type="ublox_utm"/>
 
     <subsystem name="i2c"/>
 
diff --git a/conf/airframes/Poine/funjet42.xml b/conf/airframes/Poine/funjet42.xml
index 875701c703..f207399ce6 100644
--- a/conf/airframes/Poine/funjet42.xml
+++ b/conf/airframes/Poine/funjet42.xml
@@ -16,7 +16,7 @@
     <subsystem name="telemetry" 	type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="gps" 		type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/Poine/swift_1.xml b/conf/airframes/Poine/swift_1.xml
index 0f9e70f29f..7b9a62075f 100644
--- a/conf/airframes/Poine/swift_1.xml
+++ b/conf/airframes/Poine/swift_1.xml
@@ -16,7 +16,7 @@
     <subsystem name="telemetry" 	type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="gps" 		type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/TU_Delft/MicrojetBR.xml b/conf/airframes/TU_Delft/MicrojetBR.xml
index 3ef28141cd..3c61ec196b 100644
--- a/conf/airframes/TU_Delft/MicrojetBR.xml
+++ b/conf/airframes/TU_Delft/MicrojetBR.xml
@@ -261,7 +261,7 @@
       <configure name="ADC_GYRO_ROLL" 	value="ADC_3" />
     </subsystem>
 -->    <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea4p"/>
+    <subsystem name="gps" 		type="ublox_utm"/>
     <subsystem name="control"	/>
     <subsystem name="navigation"	type="extra"/>
 
diff --git a/conf/airframes/TU_Delft/MicrojetBRimu.xml b/conf/airframes/TU_Delft/MicrojetBRimu.xml
index c9bacfa7ed..f43c11d34e 100644
--- a/conf/airframes/TU_Delft/MicrojetBRimu.xml
+++ b/conf/airframes/TU_Delft/MicrojetBRimu.xml
@@ -298,7 +298,7 @@
     <subsystem name="ahrs" type="dcm"/>
     <subsystem name="i2c"/>
 
-    <subsystem name="gps" 		type="ublox_lea4p"/>
+    <subsystem name="gps" 		type="ublox_utm"/>
     <subsystem name="control"	/>
     <subsystem name="navigation" />
 
diff --git a/conf/airframes/TU_Delft/MicrojetCDW.xml b/conf/airframes/TU_Delft/MicrojetCDW.xml
index fadfc8e760..e2886febb2 100644
--- a/conf/airframes/TU_Delft/MicrojetCDW.xml
+++ b/conf/airframes/TU_Delft/MicrojetCDW.xml
@@ -215,7 +215,7 @@
     <!-- Sensors -->
     <subsystem name="imu" type="booz"/>
     <subsystem name="ahrs" type="dcm"/>
-    <subsystem name="gps" type="ublox_lea4p"/>
+    <subsystem name="gps" type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/delta_wing_minimal_example.xml b/conf/airframes/delta_wing_minimal_example.xml
index ff34074880..63256bbf06 100644
--- a/conf/airframes/delta_wing_minimal_example.xml
+++ b/conf/airframes/delta_wing_minimal_example.xml
@@ -18,7 +18,7 @@
     <subsystem name="telemetry" 	type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		    type="ublox_lea5h"/>
+    <subsystem name="gps" 		    type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/easy_glider_example.xml b/conf/airframes/easy_glider_example.xml
index 313e793a84..34404f643d 100644
--- a/conf/airframes/easy_glider_example.xml
+++ b/conf/airframes/easy_glider_example.xml
@@ -169,7 +169,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		    type="ublox_lea4p"/>
+    <subsystem name="gps" 		    type="ublox_utm"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/easystar_ets_example.xml b/conf/airframes/easystar_ets_example.xml
index 763be2683d..7e4ca831bc 100644
--- a/conf/airframes/easystar_ets_example.xml
+++ b/conf/airframes/easystar_ets_example.xml
@@ -25,7 +25,7 @@
     <subsystem name="telemetry"     type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude"      type="infrared"/>
-    <subsystem name="gps"           type="ublox_lea5h"/>
+    <subsystem name="gps"           type="ublox"/>
     <subsystem name="navigation"    type="extra"/>
     <subsystem name="i2c"/>
   </firmware>
diff --git a/conf/airframes/easystar_example.xml b/conf/airframes/easystar_example.xml
index edf296f575..f1241e5274 100644
--- a/conf/airframes/easystar_example.xml
+++ b/conf/airframes/easystar_example.xml
@@ -24,7 +24,7 @@
     <subsystem name="telemetry" type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude" type="infrared"/>
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/example_twog_analogimu.xml b/conf/airframes/example_twog_analogimu.xml
index cfe4def763..d212c9586d 100644
--- a/conf/airframes/example_twog_analogimu.xml
+++ b/conf/airframes/example_twog_analogimu.xml
@@ -213,7 +213,7 @@
     </subsystem>
 
     <subsystem name="ahrs"  type="dcm"/>
-    <subsystem name="gps"       type="ublox_lea5h"/>
+    <subsystem name="gps"       type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/flixr_discovery.xml b/conf/airframes/flixr_discovery.xml
index c11a5d7754..95dd5eae07 100644
--- a/conf/airframes/flixr_discovery.xml
+++ b/conf/airframes/flixr_discovery.xml
@@ -42,7 +42,7 @@ http://paparazzi.enac.fr/w/index.php?title=Theory_of_Operation
 
     <!-- Sensors -->
     <subsystem name="imu" type="booz"/>
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
     <subsystem name="current_sensor">
       <configure name="ADC_CURRENT_SENSOR" value="ADC_3"/>
     </subsystem>
diff --git a/conf/airframes/funjet_cam_example.xml b/conf/airframes/funjet_cam_example.xml
index 839a8f761d..cf62325753 100644
--- a/conf/airframes/funjet_cam_example.xml
+++ b/conf/airframes/funjet_cam_example.xml
@@ -28,7 +28,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		    type="ublox_lea5h"/>
+    <subsystem name="gps" 		    type="ublox"/>
 
     <subsystem name="navigation"/>
   </firmware>
diff --git a/conf/airframes/funjet_example.xml b/conf/airframes/funjet_example.xml
index 9257855ec5..967e9cb736 100644
--- a/conf/airframes/funjet_example.xml
+++ b/conf/airframes/funjet_example.xml
@@ -28,7 +28,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		    type="ublox_lea5h"/>
+    <subsystem name="gps" 		    type="ublox"/>
 
     <subsystem name="navigation"/>
   </firmware>
diff --git a/conf/airframes/jsbsim.xml b/conf/airframes/jsbsim.xml
index 18dc8cc3ca..9c70b45f8e 100644
--- a/conf/airframes/jsbsim.xml
+++ b/conf/airframes/jsbsim.xml
@@ -217,7 +217,7 @@
     <!-- Sensors -->
     <subsystem name="gyro"          type="roll"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		    type="ublox_lea4p"/>
+    <subsystem name="gps" 		    type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/mentor_tum.xml b/conf/airframes/mentor_tum.xml
index 4d00f9c4fa..54be2a848c 100644
--- a/conf/airframes/mentor_tum.xml
+++ b/conf/airframes/mentor_tum.xml
@@ -24,7 +24,7 @@
     <subsystem name="telemetry" type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude" type="infrared"/>
-    <subsystem name="gps" type="ublox_lea5h"/>
+    <subsystem name="gps" type="ublox"/>
     <subsystem name="navigation" type="extra"/>
   </firmware>
 
diff --git a/conf/airframes/microjet_example.xml b/conf/airframes/microjet_example.xml
index 405a1356c0..a815fd777c 100644
--- a/conf/airframes/microjet_example.xml
+++ b/conf/airframes/microjet_example.xml
@@ -187,7 +187,7 @@
     <!-- Sensors -->
     <subsystem name="gyro"          type="roll"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		    type="ublox_lea4p"/>
+    <subsystem name="gps" 		    type="ublox_utm"/>
     <subsystem name="navigation"/>
 
   </firmware>
diff --git a/conf/airframes/mm/extra/probe_t.xml b/conf/airframes/mm/extra/probe_t.xml
index 217b5f9bbd..c35b765f3c 100644
--- a/conf/airframes/mm/extra/probe_t.xml
+++ b/conf/airframes/mm/extra/probe_t.xml
@@ -17,7 +17,7 @@
     <subsystem name="telemetry"        type="xbee_api"/>
     <subsystem name="control"/>
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/mm/extra/turbine_trigger.xml b/conf/airframes/mm/extra/turbine_trigger.xml
index 91c6cad9a1..59b3a1db34 100644
--- a/conf/airframes/mm/extra/turbine_trigger.xml
+++ b/conf/airframes/mm/extra/turbine_trigger.xml
@@ -10,7 +10,7 @@
     <subsystem name="telemetry"        type="xbee_api"/>
     <subsystem name="control"/>
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/mm/fixed-wing/drops.xml b/conf/airframes/mm/fixed-wing/drops.xml
index d725fffcde..9fcb3e4fd8 100644
--- a/conf/airframes/mm/fixed-wing/drops.xml
+++ b/conf/airframes/mm/fixed-wing/drops.xml
@@ -23,7 +23,7 @@
     <subsystem name="telemetry" 	type="xbee_api"/>
     <subsystem name="control_adaptive"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="gps" 		type="ublox"/>
     <subsystem name="navigation"/>
     <subsystem name="navigation_bomb"/>
 
diff --git a/conf/airframes/mm/fixed-wing/funjet43.xml b/conf/airframes/mm/fixed-wing/funjet43.xml
index 8da7f898a5..0126c730bf 100644
--- a/conf/airframes/mm/fixed-wing/funjet43.xml
+++ b/conf/airframes/mm/fixed-wing/funjet43.xml
@@ -21,7 +21,7 @@
     <subsystem name="telemetry" 	type="transparent"/>
     <subsystem name="control"/>
     <!--subsystem name="attitude" 		type="infrared"/-->
-    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="gps" 		type="ublox"/>
     <subsystem name="navigation"/>
     <!-- Interfaces -->
     <subsystem name="i2c"/>
diff --git a/conf/airframes/mm/fixed-wing/funjetdca.xml b/conf/airframes/mm/fixed-wing/funjetdca.xml
index 43cad0aa91..f7f7c92b6d 100644
--- a/conf/airframes/mm/fixed-wing/funjetdca.xml
+++ b/conf/airframes/mm/fixed-wing/funjetdca.xml
@@ -34,7 +34,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <!-- Nav -->
     <subsystem name="navigation"/>
     <!-- Interfaces -->
diff --git a/conf/airframes/mm/fixed-wing/funjetdcb.xml b/conf/airframes/mm/fixed-wing/funjetdcb.xml
index a22e56f15f..90c5701c00 100644
--- a/conf/airframes/mm/fixed-wing/funjetdcb.xml
+++ b/conf/airframes/mm/fixed-wing/funjetdcb.xml
@@ -34,7 +34,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <!-- Nav -->
     <subsystem name="navigation"/>
     <!-- Interfaces -->
diff --git a/conf/airframes/mm/fixed-wing/funjetdcc.xml b/conf/airframes/mm/fixed-wing/funjetdcc.xml
index f97b1f2fea..ea06dceedb 100644
--- a/conf/airframes/mm/fixed-wing/funjetdcc.xml
+++ b/conf/airframes/mm/fixed-wing/funjetdcc.xml
@@ -34,7 +34,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea4p"/>
+    <subsystem name="gps"              type="ublox_utm"/>
     <!-- Nav -->
     <subsystem name="navigation"/>
     <!-- Interfaces -->
diff --git a/conf/airframes/mm/fixed-wing/funjetgfi8.xml b/conf/airframes/mm/fixed-wing/funjetgfi8.xml
index 2f28f49668..3c3955a099 100644
--- a/conf/airframes/mm/fixed-wing/funjetgfi8.xml
+++ b/conf/airframes/mm/fixed-wing/funjetgfi8.xml
@@ -29,7 +29,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <!-- Nav -->
     <subsystem name="navigation"/>
     <!-- Interfaces -->
diff --git a/conf/airframes/mm/fixed-wing/funjetlisa.xml b/conf/airframes/mm/fixed-wing/funjetlisa.xml
index a92f5d8271..2831f87b3c 100644
--- a/conf/airframes/mm/fixed-wing/funjetlisa.xml
+++ b/conf/airframes/mm/fixed-wing/funjetlisa.xml
@@ -17,7 +17,7 @@
     <subsystem name="telemetry" 	type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea5h">
+    <subsystem name="gps" 		type="ublox">
       <configure name="GPS_PORT"         value="UART3"/>
     </subsystem>
     <subsystem name="navigation"/>
diff --git a/conf/airframes/mm/fixed-wing/funjetlisam.xml b/conf/airframes/mm/fixed-wing/funjetlisam.xml
index 33e68d8522..ba9395fce4 100644
--- a/conf/airframes/mm/fixed-wing/funjetlisam.xml
+++ b/conf/airframes/mm/fixed-wing/funjetlisam.xml
@@ -17,7 +17,7 @@
     <subsystem name="telemetry" 	type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea5h">
+    <subsystem name="gps" 		type="ublox">
       <configure name="GPS_PORT"         value="UART3"/>
     </subsystem>
     <subsystem name="navigation"/>
diff --git a/conf/airframes/mm/fixed-wing/funjetmm.xml b/conf/airframes/mm/fixed-wing/funjetmm.xml
index 7249478bc8..7dee6dd558 100644
--- a/conf/airframes/mm/fixed-wing/funjetmm.xml
+++ b/conf/airframes/mm/fixed-wing/funjetmm.xml
@@ -37,7 +37,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <!-- Nav -->
     <subsystem name="navigation"/>
     <!-- Interfaces -->
diff --git a/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml b/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
index 144fa3b68f..bd593ded79 100644
--- a/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
+++ b/conf/airframes/mm/fixed-wing/fw_ins_arduimu.xml
@@ -35,7 +35,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <!--subsystem name="attitude"         type="infrared"/-->
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <!-- Nav -->
     <subsystem name="navigation"/>
     <!-- Interfaces -->
diff --git a/conf/airframes/mm/fixed-wing/merlin.xml b/conf/airframes/mm/fixed-wing/merlin.xml
index cd9c69901e..c901aafb24 100644
--- a/conf/airframes/mm/fixed-wing/merlin.xml
+++ b/conf/airframes/mm/fixed-wing/merlin.xml
@@ -182,7 +182,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea4p"/>
+    <subsystem name="gps"              type="ublox_utm"/>
     <!-- Nav -->
     <subsystem name="navigation"/>
     <!-- Interfaces -->
diff --git a/conf/airframes/mm/fixed-wing/slowfast.xml b/conf/airframes/mm/fixed-wing/slowfast.xml
index 13fca656e9..e2490384cf 100644
--- a/conf/airframes/mm/fixed-wing/slowfast.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast.xml
@@ -23,7 +23,7 @@
     <subsystem name="telemetry" 	type="xbee_api"/>
     <subsystem name="control"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="gps" 		type="ublox"/>
     <subsystem name="navigation"/>
 
     <subsystem name="gyro" type="roll">
diff --git a/conf/airframes/mm/fixed-wing/slowfast2.xml b/conf/airframes/mm/fixed-wing/slowfast2.xml
index 13db40d0c9..622adedb12 100644
--- a/conf/airframes/mm/fixed-wing/slowfast2.xml
+++ b/conf/airframes/mm/fixed-wing/slowfast2.xml
@@ -24,7 +24,7 @@
     <subsystem name="telemetry" 	type="xbee_api"/>
     <subsystem name="control"/>
     <subsystem name="attitude" 		type="infrared"/>
-    <subsystem name="gps" 		type="ublox_lea5h"/>
+    <subsystem name="gps" 		type="ublox"/>
     <subsystem name="navigation"/>
 
     <subsystem name="i2c"/>
diff --git a/conf/airframes/test_hb.xml b/conf/airframes/test_hb.xml
index 30cfa01a09..fc87901459 100644
--- a/conf/airframes/test_hb.xml
+++ b/conf/airframes/test_hb.xml
@@ -17,7 +17,7 @@
 
     <!-- Sensors -->
     <subsystem name="imu" type="hb"/>
-    <subsystem name="gps" 		    type="ublox_lea5h"/>
+    <subsystem name="gps" 		    type="ublox"/>
 
     <subsystem name="navigation"/>
   </firmware>
diff --git a/conf/airframes/twinjet_example.xml b/conf/airframes/twinjet_example.xml
index b5974575d7..58a8205193 100644
--- a/conf/airframes/twinjet_example.xml
+++ b/conf/airframes/twinjet_example.xml
@@ -23,7 +23,7 @@
     <subsystem name="control"/>
     <subsystem name="attitude"      type="infrared"/>
     <subsystem name="gyro"          type="roll"/>
-    <subsystem name="gps"           type="ublox_lea5h"/>
+    <subsystem name="gps"           type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/twinjet_overo.xml b/conf/airframes/twinjet_overo.xml
index 5ed5655242..52b4e0f3d9 100644
--- a/conf/airframes/twinjet_overo.xml
+++ b/conf/airframes/twinjet_overo.xml
@@ -26,7 +26,7 @@
     <subsystem name="control"/>
     <subsystem name="attitude"      type="infrared"/>
     <subsystem name="gyro"          type="roll"/>
-    <subsystem name="gps"           type="ublox_lea5h_hitl"/>
+    <subsystem name="gps"           type="ublox_hitl"/>
     <subsystem name="navigation"/>
     <subsystem name="joystick"/>
   </firmware>
diff --git a/conf/airframes/twinstar_example.xml b/conf/airframes/twinstar_example.xml
index 264b8af0ec..c5187f7674 100644
--- a/conf/airframes/twinstar_example.xml
+++ b/conf/airframes/twinstar_example.xml
@@ -23,7 +23,7 @@
     <subsystem name="telemetry"     type="transparent"/>
     <subsystem name="control"/>
     <subsystem name="attitude"      type="infrared"/>
-    <subsystem name="gps"           type="ublox_lea4p"/>
+    <subsystem name="gps"           type="ublox_utm"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/airframes/usb_test.xml b/conf/airframes/usb_test.xml
index 51592e9f3f..197e442754 100644
--- a/conf/airframes/usb_test.xml
+++ b/conf/airframes/usb_test.xml
@@ -15,7 +15,7 @@
     <subsystem name="control"/>
     <!-- Sensors -->
     <subsystem name="attitude"         type="infrared"/>
-    <subsystem name="gps"              type="ublox_lea5h"/>
+    <subsystem name="gps"              type="ublox"/>
     <subsystem name="navigation"/>
   </firmware>
 
diff --git a/conf/autopilot/subsystems/fixedwing/gps_ublox.makefile b/conf/autopilot/subsystems/fixedwing/gps_ublox.makefile
new file mode 100644
index 0000000000..d8d5723be0
--- /dev/null
+++ b/conf/autopilot/subsystems/fixedwing/gps_ublox.makefile
@@ -0,0 +1,23 @@
+# UBlox LEA 5H
+
+
+ap.CFLAGS += -DUSE_GPS -DUBX -DGPS_USE_LATLONG
+ap.CFLAGS += -DGPS_LINK=$(GPS_PORT)
+ap.CFLAGS += -DUSE_$(GPS_PORT)
+ap.CFLAGS += -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
+
+ifneq ($(GPS_LED),none)
+  ap.CFLAGS += -DGPS_LED=$(GPS_LED)
+endif
+
+ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
+ap.srcs   += $(SRC_SUBSYSTEMS)/gps/gps_ubx.c
+
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/gps.c
+
+sim.CFLAGS += -DUSE_GPS -DGPS_USE_LATLONG
+sim.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
+sim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c
+
+jsbsim.CFLAGS += -DUSE_GPS -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
+jsbsim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c
diff --git a/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile b/conf/autopilot/subsystems/fixedwing/gps_ublox_hitl.makefile
similarity index 85%
rename from conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile
rename to conf/autopilot/subsystems/fixedwing/gps_ublox_hitl.makefile
index 40338ab345..43d6130d6b 100644
--- a/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h_hitl.makefile
+++ b/conf/autopilot/subsystems/fixedwing/gps_ublox_hitl.makefile
@@ -1,4 +1,4 @@
-# UBlox LEA 5H
+# UBlox Hardware In The Loop
 
 
 ap.CFLAGS += -DUSE_GPS -DUBX -DGPS_USE_LATLONG
diff --git a/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile b/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
index 368d4e76a8..da4d84a19d 100644
--- a/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
+++ b/conf/autopilot/subsystems/fixedwing/gps_ublox_lea4p.makefile
@@ -1,22 +1,3 @@
 # UBlox LEA 4P
 
-
-ap.CFLAGS += -DUSE_GPS -DUBX
-ap.CFLAGS += -DGPS_LINK=$(GPS_PORT)
-ap.CFLAGS += -DUSE_$(GPS_PORT)
-ap.CFLAGS += -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
-
-ifneq ($(GPS_LED),none)
-  ap.CFLAGS += -DGPS_LED=$(GPS_LED)
-endif
-
-ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
-ap.srcs   += $(SRC_SUBSYSTEMS)/gps/gps_ubx.c
-
-$(TARGET).srcs += $(SRC_SUBSYSTEMS)/gps.c
-
-sim.CFLAGS += -DUSE_GPS -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
-sim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c
-
-jsbsim.CFLAGS += -DUSE_GPS -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
-jsbsim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c
+$(error The gps_ublox_lea4p subsystem has been renamed, please replace <subsystem name="gps" type="ublox_lea4p"/> with <subsystem name="gps" type="ublox_utm"/> in your airframe file.)
diff --git a/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile b/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
index d8d5723be0..59e9799be5 100644
--- a/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
+++ b/conf/autopilot/subsystems/fixedwing/gps_ublox_lea5h.makefile
@@ -1,23 +1,4 @@
 # UBlox LEA 5H
 
+$(error The gps_ublox_lea5h subsystem has been renamed, please replace <subsystem name="gps" type="ublox_lea5h"/> with <subsystem name="gps" type="ublox"/> in your airframe file.)
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DGPS_USE_LATLONG
-ap.CFLAGS += -DGPS_LINK=$(GPS_PORT)
-ap.CFLAGS += -DUSE_$(GPS_PORT)
-ap.CFLAGS += -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
-
-ifneq ($(GPS_LED),none)
-  ap.CFLAGS += -DGPS_LED=$(GPS_LED)
-endif
-
-ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
-ap.srcs   += $(SRC_SUBSYSTEMS)/gps/gps_ubx.c
-
-$(TARGET).srcs += $(SRC_SUBSYSTEMS)/gps.c
-
-sim.CFLAGS += -DUSE_GPS -DGPS_USE_LATLONG
-sim.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
-sim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c
-
-jsbsim.CFLAGS += -DUSE_GPS -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
-jsbsim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c
diff --git a/conf/autopilot/subsystems/fixedwing/gps_ublox_utm.makefile b/conf/autopilot/subsystems/fixedwing/gps_ublox_utm.makefile
new file mode 100644
index 0000000000..368d4e76a8
--- /dev/null
+++ b/conf/autopilot/subsystems/fixedwing/gps_ublox_utm.makefile
@@ -0,0 +1,22 @@
+# UBlox LEA 4P
+
+
+ap.CFLAGS += -DUSE_GPS -DUBX
+ap.CFLAGS += -DGPS_LINK=$(GPS_PORT)
+ap.CFLAGS += -DUSE_$(GPS_PORT)
+ap.CFLAGS += -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
+
+ifneq ($(GPS_LED),none)
+  ap.CFLAGS += -DGPS_LED=$(GPS_LED)
+endif
+
+ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
+ap.srcs   += $(SRC_SUBSYSTEMS)/gps/gps_ubx.c
+
+$(TARGET).srcs += $(SRC_SUBSYSTEMS)/gps.c
+
+sim.CFLAGS += -DUSE_GPS -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
+sim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c
+
+jsbsim.CFLAGS += -DUSE_GPS -DGPS_TYPE_H=\"subsystems/gps/gps_sim.h\"
+jsbsim.srcs += $(SRC_SUBSYSTEMS)/gps/gps_sim.c