diff --git a/src/main/target/SKYZONEF405/target.h b/src/main/target/SKYZONEF405/target.h
index 5823a83267..7524daae97 100644
--- a/src/main/target/SKYZONEF405/target.h
+++ b/src/main/target/SKYZONEF405/target.h
@@ -47,14 +47,14 @@
 
 #define USE_GYRO
 #define USE_ACC
-#define ICM20689_CS_PIN          PA4
-#define ICM20689_SPI_INSTANCE    SPI1
-
 #define USE_GYRO_SPI_ICM20689
-#define GYRO_ICM20689_ALIGN      CW90_DEG
-
 #define USE_ACC_SPI_ICM20689
-#define ACC_ICM20689_ALIGN       CW90_DEG
+
+#define GYRO_1_CS_PIN           PA4
+#define GYRO_1_SPI_INSTANCE     SPI1
+
+#define GYRO_1_ALIGN            CW90_DEG
+#define ACC_1_ALIGN             CW90_DEG
 
 #define USE_I2C
 #define USE_I2C_DEVICE_1
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index 7af7aac8d7..bacd56ec96 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -115,13 +115,13 @@
 
 #elif defined(IRCSYNERGYF3)
 #define USE_GYRO_SPI_MPU6000
-#define GYRO_MPU6000_ALIGN      CW270_DEG
+#define GYRO_1_ALIGN            CW270_DEG
 
 #define USE_ACC_SPI_MPU6000
-#define ACC_MPU6000_ALIGN       CW270_DEG
+#define ACC_1_ALIGN             CW270_DEG
 
-#define MPU6000_CS_PIN           PB12
-#define MPU6000_SPI_INSTANCE     SPI2
+#define GYRO_1_CS_PIN           PB12
+#define GYRO_1_SPI_INSTANCE     SPI2
 #else
 #define USE_GYRO_MPU6050
 #define GYRO_1_ALIGN            CW270_DEG