diff --git a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM
index 8085176822..0d367022c6 100644
--- a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM
+++ b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APM
@@ -74,7 +74,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if hmc5883_onboard start
+if hmc5883i start
 then
     echo "[APM] HMC5883 onboard started OK"
 #    if hmc5883 calibrate
@@ -88,7 +88,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if hmc5883_external start
+if hmc5883e start
 then
     echo "[APM] HMC5883 external started OK"
 #    if hmc5883 calibrate
@@ -102,7 +102,7 @@ else
 #    sh /etc/init.d/rc.error
 fi
 
-if mpu6000_onboard start
+if mpu6000i start
 then
     echo "[APM] MPU6000 onboard started OK"
 else
@@ -110,7 +110,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if mpu6000_external start
+if mpu6000e start
 then
     echo "[APM] MPU6000 external started OK"
 else
diff --git a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS
index c0a02c3c5a..0209e8a9a4 100644
--- a/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS
+++ b/mk/VRBRAIN/ROMFS_VRBRAIN45_APM/init.d/rc.APMNS
@@ -47,7 +47,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if hmc5883_onboard start
+if hmc5883i start
 then
     echo "[APMNS] HMC5883 onboard started OK"
 #    if hmc5883 calibrate
@@ -61,7 +61,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if hmc5883_external start
+if hmc5883e start
 then
     echo "[APMNS] HMC5883 external started OK"
 #    if hmc5883 calibrate
@@ -75,7 +75,7 @@ else
 #    sh /etc/init.d/rc.error
 fi
 
-if mpu6000_onboard start
+if mpu6000i start
 then
     echo "[APMNS] MPU6000 onboard started OK"
 else
@@ -83,7 +83,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if mpu6000_external start
+if mpu6000e start
 then
     echo "[APMNS] MPU6000 external started OK"
 else
diff --git a/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APM b/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APM
index e13db9fda3..a5dedba600 100644
--- a/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APM
+++ b/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APM
@@ -74,7 +74,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if hmc5883_onboard start
+if hmc5883i start
 then
     echo "[APM] HMC5883 onboard started OK"
 #    if hmc5883 calibrate
@@ -88,7 +88,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-#if hmc5883_external start
+#if hmc5883e start
 #then
 #    echo "[APM] HMC5883 external started OK"
 #    if hmc5883 calibrate
@@ -102,7 +102,7 @@ fi
 #    sh /etc/init.d/rc.error
 #fi
 
-if mpu6000_onboard start
+if mpu6000i start
 then
     echo "[APM] MPU6000 onboard started OK"
 else
@@ -110,7 +110,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-#if mpu6000_external start
+#if mpu6000e start
 #then
 #    echo "[APM] MPU6000 external started OK"
 #else
diff --git a/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APMNS b/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APMNS
index c0a02c3c5a..0209e8a9a4 100644
--- a/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APMNS
+++ b/mk/VRBRAIN/ROMFS_VRBRAIN51_APM/init.d/rc.APMNS
@@ -47,7 +47,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if hmc5883_onboard start
+if hmc5883i start
 then
     echo "[APMNS] HMC5883 onboard started OK"
 #    if hmc5883 calibrate
@@ -61,7 +61,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if hmc5883_external start
+if hmc5883e start
 then
     echo "[APMNS] HMC5883 external started OK"
 #    if hmc5883 calibrate
@@ -75,7 +75,7 @@ else
 #    sh /etc/init.d/rc.error
 fi
 
-if mpu6000_onboard start
+if mpu6000i start
 then
     echo "[APMNS] MPU6000 onboard started OK"
 else
@@ -83,7 +83,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-if mpu6000_external start
+if mpu6000e start
 then
     echo "[APMNS] MPU6000 external started OK"
 else
diff --git a/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APM b/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APM
index 0fde96edd2..05303d6b19 100644
--- a/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APM
+++ b/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APM
@@ -74,7 +74,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-#if hmc5883_onboard start
+#if hmc5883i start
 #then
 #    echo "[APM] HMC5883 onboard started OK"
 #    if hmc5883 calibrate
@@ -88,7 +88,7 @@ fi
 #    sh /etc/init.d/rc.error
 #fi
 
-if hmc5883_external start
+if hmc5883e start
 then
     echo "[APM] HMC5883 external started OK"
 #    if hmc5883 calibrate
@@ -102,7 +102,7 @@ else
 #    sh /etc/init.d/rc.error
 fi
 
-if mpu6000_onboard start
+if mpu6000i start
 then
     echo "[APM] MPU6000 onboard started OK"
 else
@@ -110,7 +110,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-#if mpu6000_external start
+#if mpu6000e start
 #then
 #    echo "[APM] MPU6000 external started OK"
 #else
diff --git a/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APMNS b/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APMNS
index 0af6467805..885a96b4d4 100644
--- a/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APMNS
+++ b/mk/VRBRAIN/ROMFS_VRUBRAIN51_APM/init.d/rc.APMNS
@@ -47,7 +47,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-#if hmc5883_onboard start
+#if hmc5883i start
 #then
 #    echo "[APMNS] HMC5883 onboard started OK"
 #    if hmc5883 calibrate
@@ -61,7 +61,7 @@ fi
 #    sh /etc/init.d/rc.error
 #fi
 
-if hmc5883_external start
+if hmc5883e start
 then
     echo "[APMNS] HMC5883 external started OK"
 #    if hmc5883 calibrate
@@ -75,7 +75,7 @@ else
 #    sh /etc/init.d/rc.error
 fi
 
-if mpu6000_onboard start
+if mpu6000i start
 then
     echo "[APMNS] MPU6000 onboard started OK"
 else
@@ -83,7 +83,7 @@ else
     sh /etc/init.d/rc.error
 fi
 
-#if mpu6000_external start
+#if mpu6000e start
 #then
 #    echo "[APMNS] MPU6000 external started OK"
 #else
diff --git a/mk/VRBRAIN/config_vrbrain-v45_APM.mk b/mk/VRBRAIN/config_vrbrain-v45_APM.mk
index 1bb5c8baba..7bc05860ca 100644
--- a/mk/VRBRAIN/config_vrbrain-v45_APM.mk
+++ b/mk/VRBRAIN/config_vrbrain-v45_APM.mk
@@ -27,13 +27,12 @@ MODULES		+= drivers/vrbrain/vrinput
 
 
 
-#MODULES		+= drivers/mpu6000
-MODULES		+= drivers/mpu6000_external
-MODULES		+= drivers/mpu6000_onboard
+MODULES		+= drivers/mpu6000e
+MODULES		+= drivers/mpu6000i
+
+MODULES		+= drivers/hmc5883e
+MODULES		+= drivers/hmc5883i
 
-#MODULES		+= drivers/hmc5883
-MODULES		+= drivers/hmc5883_external
-MODULES		+= drivers/hmc5883_onboard
 MODULES		+= drivers/ms5611
 
 
diff --git a/mk/VRBRAIN/config_vrbrain-v51_APM.mk b/mk/VRBRAIN/config_vrbrain-v51_APM.mk
index f6c80a773a..fa8fc58ebc 100644
--- a/mk/VRBRAIN/config_vrbrain-v51_APM.mk
+++ b/mk/VRBRAIN/config_vrbrain-v51_APM.mk
@@ -27,13 +27,12 @@ MODULES		+= drivers/vrbrain/vrinput
 
 
 
-#MODULES		+= drivers/mpu6000
-MODULES		+= drivers/mpu6000_external
-MODULES		+= drivers/mpu6000_onboard
+MODULES		+= drivers/mpu6000e
+MODULES		+= drivers/mpu6000i
+
+MODULES		+= drivers/hmc5883e
+MODULES		+= drivers/hmc5883i
 
-#MODULES		+= drivers/hmc5883
-MODULES		+= drivers/hmc5883_external
-MODULES		+= drivers/hmc5883_onboard
 MODULES		+= drivers/ms5611
 
 
diff --git a/mk/VRBRAIN/config_vrubrain-v51_APM.mk b/mk/VRBRAIN/config_vrubrain-v51_APM.mk
index dfcbffd4e2..72ded02fdd 100644
--- a/mk/VRBRAIN/config_vrubrain-v51_APM.mk
+++ b/mk/VRBRAIN/config_vrubrain-v51_APM.mk
@@ -27,13 +27,12 @@ MODULES		+= drivers/vrbrain/vrinput
 
 
 
-#MODULES		+= drivers/mpu6000
-#MODULES		+= drivers/mpu6000_external
-MODULES		+= drivers/mpu6000_onboard
+#MODULES		+= drivers/mpu6000e
+MODULES		+= drivers/mpu6000i
+
+MODULES		+= drivers/hmc5883e
+#MODULES		+= drivers/hmc5883i
 
-#MODULES		+= drivers/hmc5883
-MODULES		+= drivers/hmc5883_external
-#MODULES		+= drivers/hmc5883_onboard
 MODULES		+= drivers/ms5611