diff --git a/src/GPS/Drivers b/src/GPS/Drivers
index 2a4865adc3808687d6c6f550f497a02eb920c382..2bfc6ffb3ba74b60deab5aef8e34c2cb909c4edc 160000
--- a/src/GPS/Drivers
+++ b/src/GPS/Drivers
@@ -1 +1 @@
-Subproject commit 2a4865adc3808687d6c6f550f497a02eb920c382
+Subproject commit 2bfc6ffb3ba74b60deab5aef8e34c2cb909c4edc
diff --git a/src/GPS/GPSPositionMessage.h b/src/GPS/GPSPositionMessage.h
index 37720502b444720c7d2a4022912175f087be9000..a2437f34ac44ce2589ccdcb7870e079f79db610a 100644
--- a/src/GPS/GPSPositionMessage.h
+++ b/src/GPS/GPSPositionMessage.h
@@ -20,7 +20,7 @@
  */
 struct GPSPositionMessage
 {
-    vehicle_gps_position_s position_data;
+    sensor_gps_s position_data;
 };
 
 Q_DECLARE_METATYPE(GPSPositionMessage);
diff --git a/src/GPS/GPSProvider.h b/src/GPS/GPSProvider.h
index 659587de2ca1796e67859d6b7306dedc5bbe98b2..6db29a19eec308496e39e496ce7f1bae01367653 100644
--- a/src/GPS/GPSProvider.h
+++ b/src/GPS/GPSProvider.h
@@ -85,8 +85,8 @@ private:
     float   _fixedBaseAltitudeMeters;
     float   _fixedBaseAccuracyMeters;
 
-	struct vehicle_gps_position_s	_reportGpsPos;
-	struct satellite_info_s		*_pReportSatInfo = nullptr;
+	struct sensor_gps_s        _reportGpsPos;
+	struct satellite_info_s    *_pReportSatInfo = nullptr;
 
 	QSerialPort *_serial = nullptr;
 };
diff --git a/src/GPS/vehicle_gps_position.h b/src/GPS/vehicle_gps_position.h
index 1a3f8d324120e36ec4d00bd48a6404d4ca195086..2107c1afb8b7b3079d474155697df6d29af85597 100644
--- a/src/GPS/vehicle_gps_position.h
+++ b/src/GPS/vehicle_gps_position.h
@@ -42,7 +42,7 @@
  * and was manually copied here.
  */
 
-struct vehicle_gps_position_s {
+struct sensor_gps_s {
 	uint64_t timestamp;
 	uint64_t time_utc_usec;
 	int32_t lat;