diff --git a/src/main/target/HAKRCF722/target.h b/src/main/target/HAKRCF722/target.h
old mode 100755
new mode 100644
index d13a232206..b7334705ee
--- a/src/main/target/HAKRCF722/target.h
+++ b/src/main/target/HAKRCF722/target.h
@@ -47,20 +47,21 @@
 #define SPI1_MISO_PIN           PA6
 #define SPI1_MOSI_PIN           PA7
 
-#define MPU6000_CS_PIN          PA4
-#define MPU6000_SPI_INSTANCE    SPI1
+#define GYRO_1_CS_PIN           PA4
+#define GYRO_1_SPI_INSTANCE     SPI1
 
 #define USE_EXTI
-#define MPU_INT_EXTI            PC4
+#define USE_GYRO_EXTI
+#define GYRO_1_EXTI_PIN         PC4
 #define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
-#define GYRO_MPU6000_ALIGN      CW270_DEG
+#define GYRO_1_ALIGN            CW270_DEG
 
 #define USE_ACC
 #define USE_ACC_SPI_MPU6000
-#define ACC_MPU6000_ALIGN       CW270_DEG
+#define ACC_1_ALIGN             CW270_DEG
 
 
 #define LED0_PIN                PC14
diff --git a/src/main/target/SKYZONEF405/target.h b/src/main/target/SKYZONEF405/target.h
index 01610ca3ba..5823a83267 100644
--- a/src/main/target/SKYZONEF405/target.h
+++ b/src/main/target/SKYZONEF405/target.h
@@ -41,7 +41,8 @@
 #define SPI1_MOSI_PIN           PA7
 
 #define USE_EXTI
-#define MPU_INT_EXTI            PC4
+#define USE_GYRO_EXTI
+#define GYRO_1_EXTI_PIN         PC4
 #define USE_MPU_DATA_READY_SIGNAL
 
 #define USE_GYRO
diff --git a/src/main/target/STM32F7X2/config/NERO.config b/src/main/target/STM32F7X2/config/NERO.config
index 094a7caa3b..57f7556c3e 100644
--- a/src/main/target/STM32F7X2/config/NERO.config
+++ b/src/main/target/STM32F7X2/config/NERO.config
@@ -38,7 +38,7 @@ resource SPI_PREINIT_IPU 2 A15 // SDCARD
 resource gyro_cs 1 C4
 set gyro_1_bustype = SPI
 set gyro_1_spibus = 1
-#set gyro_1_hardware = MPU6500 # Not working (yet)
+#set gyro_1_hardware = MPU6500 # Not working (yet ... will it ever?)
 
 # Timers
 # First four timers
diff --git a/src/main/target/STM32F7X2/target.h b/src/main/target/STM32F7X2/target.h
index 08995555e4..b1415742d7 100644
--- a/src/main/target/STM32F7X2/target.h
+++ b/src/main/target/STM32F7X2/target.h
@@ -37,7 +37,6 @@
 #define USE_MPU_DATA_READY_SIGNAL
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
 #define USE_GYRO_EXTI
-#define GYRO_1_EXTI_PIN         PB15 // XXX Should be gone
 
 #define USE_ACC
 #define USE_GYRO
@@ -50,7 +49,7 @@
 #define GYRO_1_CS_PIN           NONE
 #define GYRO_1_ALIGN            ALIGN_DEFAULT
 #define ACC_1_ALIGN             ALIGN_DEFAULT
-#define GYRO_1_EXTI_PIN         NONE
+#define GYRO_1_EXTI_PIN         PB15 // XXX Should be gone
 
 #define GYRO_2_SPI_INSTANCE     SPI1
 #define GYRO_2_CS_PIN           NONE