diff --git a/cmake/configs/nuttx_aerocore2_default.cmake b/cmake/configs/nuttx_aerocore2_default.cmake
index 87e37e8565..76867b6dcc 100644
--- a/cmake/configs/nuttx_aerocore2_default.cmake
+++ b/cmake/configs/nuttx_aerocore2_default.cmake
@@ -25,7 +25,7 @@ set(config_module_list
 	drivers/pwm_out_sim
 	drivers/airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	#drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_auav-x21_default.cmake b/cmake/configs/nuttx_auav-x21_default.cmake
index b0ba209da4..125f92b1c0 100644
--- a/cmake/configs/nuttx_auav-x21_default.cmake
+++ b/cmake/configs/nuttx_auav-x21_default.cmake
@@ -37,7 +37,7 @@ set(config_module_list
 	drivers/blinkm
 	drivers/airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_mindpx-v2_default.cmake b/cmake/configs/nuttx_mindpx-v2_default.cmake
index 62d5a093be..dcaee4220b 100644
--- a/cmake/configs/nuttx_mindpx-v2_default.cmake
+++ b/cmake/configs/nuttx_mindpx-v2_default.cmake
@@ -40,7 +40,7 @@ set(config_module_list
 	drivers/blinkm
 	drivers/airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_px4fmu-v1_default.cmake b/cmake/configs/nuttx_px4fmu-v1_default.cmake
index 8055dca28d..f2c8345f59 100644
--- a/cmake/configs/nuttx_px4fmu-v1_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v1_default.cmake
@@ -35,7 +35,7 @@ set(config_module_list
 	drivers/blinkm
 	drivers/airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_px4fmu-v2_default.cmake b/cmake/configs/nuttx_px4fmu-v2_default.cmake
index 860aa2d3e7..30ff9ccf14 100644
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@@ -39,7 +39,7 @@ set(config_module_list
 	drivers/airspeed
 	drivers/sdp3x_airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_px4fmu-v2_test.cmake b/cmake/configs/nuttx_px4fmu-v2_test.cmake
index f130ef9c51..8de39df7e8 100644
--- a/cmake/configs/nuttx_px4fmu-v2_test.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake
@@ -38,7 +38,7 @@ set(config_module_list
 	drivers/blinkm
 	drivers/airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_px4fmu-v3_default.cmake b/cmake/configs/nuttx_px4fmu-v3_default.cmake
index a33534d772..d78fa255c4 100644
--- a/cmake/configs/nuttx_px4fmu-v3_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake
@@ -32,7 +32,7 @@ set(config_module_list
 	drivers/ll40ls
 	drivers/lsm303d
 	drivers/mb12xx
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/mkblctrl
 	drivers/mpu6000
diff --git a/cmake/configs/nuttx_px4fmu-v4_default.cmake b/cmake/configs/nuttx_px4fmu-v4_default.cmake
index 646973b14d..657ae20108 100644
--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@@ -37,7 +37,7 @@ set(config_module_list
 	drivers/blinkm
 	drivers/airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
index 6e8f54ff86..97fa11d58d 100644
--- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
@@ -33,7 +33,7 @@ set(config_module_list
 	drivers/ll40ls
 	drivers/lsm303d
 	drivers/mb12xx
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/mkblctrl
 	drivers/mpu6000
diff --git a/cmake/configs/nuttx_px4fmu-v5_default.cmake b/cmake/configs/nuttx_px4fmu-v5_default.cmake
index 4640268cf0..5a2ba28ca4 100644
--- a/cmake/configs/nuttx_px4fmu-v5_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake
@@ -32,7 +32,7 @@ set(config_module_list
 	drivers/lis3mdl
 	drivers/ll40ls
 	drivers/mb12xx
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/mkblctrl
 	drivers/mpu6000
diff --git a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
index bce5c5589e..05fc3b5fd9 100644
--- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
+++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
@@ -35,7 +35,7 @@ set(config_module_list
 	drivers/blinkm
 	drivers/airspeed
 	drivers/ets_airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	drivers/frsky_telemetry
 	modules/sensors
diff --git a/cmake/configs/nuttx_tap-v1_default.cmake b/cmake/configs/nuttx_tap-v1_default.cmake
index 697f0ebad2..b53f0b331c 100644
--- a/cmake/configs/nuttx_tap-v1_default.cmake
+++ b/cmake/configs/nuttx_tap-v1_default.cmake
@@ -24,7 +24,7 @@ set(config_module_list
 	drivers/hmc5883
 	drivers/gps
 	drivers/airspeed
-	drivers/meas_airspeed
+	drivers/ms4525_airspeed
 	drivers/ms5525_airspeed
 	modules/sensors
 	drivers/vmount
diff --git a/src/drivers/meas_airspeed/CMakeLists.txt b/src/drivers/ms4525_airspeed/CMakeLists.txt
similarity index 95%
rename from src/drivers/meas_airspeed/CMakeLists.txt
rename to src/drivers/ms4525_airspeed/CMakeLists.txt
index 0cdac0cbd5..e491343f1c 100644
--- a/src/drivers/meas_airspeed/CMakeLists.txt
+++ b/src/drivers/ms4525_airspeed/CMakeLists.txt
@@ -31,12 +31,12 @@
 #
 ############################################################################
 px4_add_module(
-	MODULE drivers__meas_airspeed
-	MAIN meas_airspeed
+	MODULE drivers__ms4525_airspeed
+	MAIN ms4525_airspeed
 	STACK_MAIN 1200
 	COMPILE_FLAGS
 	SRCS
-		meas_airspeed.cpp
+		ms4525_airspeed.cpp
 	DEPENDS
 		platforms__common
 	)
diff --git a/src/drivers/meas_airspeed/meas_airspeed.cpp b/src/drivers/ms4525_airspeed/ms4525_airspeed.cpp
similarity index 98%
rename from src/drivers/meas_airspeed/meas_airspeed.cpp
rename to src/drivers/ms4525_airspeed/ms4525_airspeed.cpp
index 8fd76e396a..ae868d084d 100644
--- a/src/drivers/meas_airspeed/meas_airspeed.cpp
+++ b/src/drivers/ms4525_airspeed/ms4525_airspeed.cpp
@@ -131,7 +131,7 @@ protected:
 /*
  * Driver 'main' command.
  */
-extern "C" __EXPORT int meas_airspeed_main(int argc, char *argv[]);
+extern "C" __EXPORT int ms4525_airspeed_main(int argc, char *argv[]);
 
 MEASAirspeed::MEASAirspeed(int bus, int address, const char *path) : Airspeed(bus, address,
 			CONVERSION_INTERVAL, path),
@@ -436,6 +436,12 @@ start(int i2c_bus)
 		goto fail;
 	}
 
+	/* both versions failed if the init for the MS5525DSO fails, give up */
+	if (OK != g_dev->Airspeed::init()) {
+		PX4_WARN("init fail");
+		goto fail;
+	}
+
 	/* set the poll rate to default, starts automatic data collection */
 	fd = open(PATH_MS4525, O_RDONLY);
 
@@ -596,7 +602,7 @@ meas_airspeed_usage()
 }
 
 int
-meas_airspeed_main(int argc, char *argv[])
+ms4525_airspeed_main(int argc, char *argv[])
 {
 	int i2c_bus = PX4_I2C_BUS_DEFAULT;