diff --git a/src/drivers/l3gd20/l3gd20.cpp b/src/drivers/l3gd20/l3gd20.cpp
index e48def21d0..a2533abde9 100644
--- a/src/drivers/l3gd20/l3gd20.cpp
+++ b/src/drivers/l3gd20/l3gd20.cpp
@@ -1076,7 +1076,7 @@ L3GD20::measure()
 	report.range_rad_s = _gyro_range_rad_s;
 
 	/* return device ID */
-	report.device_id = _device_id;
+	report.device_id = _device_id.devid;
 
 	_reports->force(&report);
 
diff --git a/src/drivers/lsm303d/lsm303d.cpp b/src/drivers/lsm303d/lsm303d.cpp
index c2ae46668c..e0678a84e4 100644
--- a/src/drivers/lsm303d/lsm303d.cpp
+++ b/src/drivers/lsm303d/lsm303d.cpp
@@ -1643,7 +1643,7 @@ LSM303D::measure()
 	accel_report.range_m_s2 = _accel_range_m_s2;
 
 	/* return device ID */
-	accel_report.device_id = _device_id;
+	accel_report.device_id = _device_id.devid;
 
 	_accel_reports->force(&accel_report);
 
@@ -1729,7 +1729,7 @@ LSM303D::mag_measure()
 	 */
 	_last_temperature = 25 + (raw_mag_report.temperature * 0.125f);
 	mag_report.temperature = _last_temperature;
-	mag_report.device_id = _mag->_device_id;
+	mag_report.device_id = _mag->_device_id.devid;
 
 	_mag_reports->force(&mag_report);
 
diff --git a/src/drivers/mpu6000/mpu6000.cpp b/src/drivers/mpu6000/mpu6000.cpp
index 4e7da0a2ea..2a2017b8e1 100644
--- a/src/drivers/mpu6000/mpu6000.cpp
+++ b/src/drivers/mpu6000/mpu6000.cpp
@@ -2031,7 +2031,7 @@ MPU6000::measure()
 	arb.temperature = _last_temperature;
 
 	/* return device ID */
-	arb.device_id = _device_id;
+	arb.device_id = _device_id.devid;
 
 	grb.x_raw = report.gyro_x;
 	grb.y_raw = report.gyro_y;
@@ -2067,7 +2067,7 @@ MPU6000::measure()
 	grb.temperature = _last_temperature;
 
 	/* return device ID */
-	grb.device_id = _gyro->_device_id;
+	grb.device_id = _gyro->_device_id.devid;
 
 	_accel_reports->force(&arb);
 	_gyro_reports->force(&grb);
diff --git a/src/drivers/ms5611/ms5611.cpp b/src/drivers/ms5611/ms5611.cpp
index a78f6b2c04..3c4cbbcf4b 100644
--- a/src/drivers/ms5611/ms5611.cpp
+++ b/src/drivers/ms5611/ms5611.cpp
@@ -763,7 +763,7 @@ MS5611::collect()
 		report.pressure = P / 100.0f;		/* convert to millibar */
 
 		/* return device ID */
-		report.device_id = _device_id;
+		report.device_id = _device_id.devid;
 
 		/* altitude calculations based on http://www.kansasflyer.org/index.asp?nav=Avi&sec=Alti&tab=Theory&pg=1 */