diff --git a/conf/firmwares/subsystems/rotorcraft/gps_piksi.makefile b/conf/firmwares/subsystems/rotorcraft/gps_piksi.makefile
index 1cdbe1d32a..4e517cc24d 100644
--- a/conf/firmwares/subsystems/rotorcraft/gps_piksi.makefile
+++ b/conf/firmwares/subsystems/rotorcraft/gps_piksi.makefile
@@ -8,7 +8,7 @@ GPS_PORT_LOWER=$(shell echo $(GPS_PORT) | tr A-Z a-z)
 
 ap.CFLAGS += -DUSE_GPS
 ap.CFLAGS += -DUSE_$(GPS_PORT) -D$(GPS_PORT)_BAUD=B115200
-ap.CFLAGS += -DGPS_LINK=$(GPS_PORT_LOWER)
+ap.CFLAGS += -DPIKSI_GPS_LINK=$(GPS_PORT_LOWER)
 
 ifneq ($(GPS_LED),none)
   ap.CFLAGS += -DGPS_LED=$(GPS_LED)
@@ -16,7 +16,7 @@ endif
 
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/gps.c
 
-ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_piksi.h\"
+ap.CFLAGS += -DPRIMARY_GPS_TYPE_H=\"subsystems/gps/gps_piksi.h\"
 ap.srcs   += $(SRC_SUBSYSTEMS)/gps/gps_piksi.c
 
 # libsbp
diff --git a/conf/firmwares/subsystems/shared/gps_piksi.makefile b/conf/firmwares/subsystems/shared/gps_piksi.makefile
index 50d4879b97..d17a135bee 100644
--- a/conf/firmwares/subsystems/shared/gps_piksi.makefile
+++ b/conf/firmwares/subsystems/shared/gps_piksi.makefile
@@ -16,7 +16,7 @@ endif
 
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/gps.c
 
-ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_piksi.h\"
+ap.CFLAGS += -DPRIMARY_GPS_TYPE_H=\"subsystems/gps/gps_piksi.h\"
 ap.srcs   += $(SRC_SUBSYSTEMS)/gps/gps_piksi.c
 
 # libsbp
diff --git a/conf/firmwares/subsystems/shared/gps_ublox.makefile b/conf/firmwares/subsystems/shared/gps_ublox.makefile
index d18fc98df7..1ad7919969 100644
--- a/conf/firmwares/subsystems/shared/gps_ublox.makefile
+++ b/conf/firmwares/subsystems/shared/gps_ublox.makefile
@@ -5,7 +5,7 @@ GPS_LED ?= none
 UBX_GPS_PORT_LOWER=$(shell echo $(GPS_PORT) | tr A-Z a-z)
 
 ap.CFLAGS += -DUSE_GPS -DUBX
-ap.CFLAGS += -DGPS_LINK=$(UBX_GPS_PORT_LOWER)
+ap.CFLAGS += -DUBX_GPS_LINK=$(UBX_GPS_PORT_LOWER)
 ap.CFLAGS += -DUSE_$(GPS_PORT)
 ap.CFLAGS += -D$(GPS_PORT)_BAUD=$(GPS_BAUD)
 
@@ -13,7 +13,7 @@ ifneq ($(GPS_LED),none)
   ap.CFLAGS += -DGPS_LED=$(GPS_LED)
 endif
 
-ap.CFLAGS += -DGPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
+ap.CFLAGS += -DPRIMARY_GPS_TYPE_H=\"subsystems/gps/gps_ubx.h\"
 ap.srcs   += $(SRC_SUBSYSTEMS)/gps/gps_ubx.c
 
 $(TARGET).srcs += $(SRC_SUBSYSTEMS)/gps.c