diff --git a/boards/aerotenna/ocpoc/ubuntu.cmake b/boards/aerotenna/ocpoc/ubuntu.cmake
index 66d39ece2c73b2c13d01547bb050f007bad1a40d..236c3a99057c532d0ca48f2f849ed65b979db29b 100644
--- a/boards/aerotenna/ocpoc/ubuntu.cmake
+++ b/boards/aerotenna/ocpoc/ubuntu.cmake
@@ -48,7 +48,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -77,6 +76,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/airmind/mindpx-v2/default.cmake b/boards/airmind/mindpx-v2/default.cmake
index 28c056cbb4a39a64bdb52d97924bf980ca626275..852df4b6e3cb94f4ecf9207c5f35349b53b1b806 100644
--- a/boards/airmind/mindpx-v2/default.cmake
+++ b/boards/airmind/mindpx-v2/default.cmake
@@ -67,7 +67,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -105,6 +104,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/atlflight/eagle/default.cmake b/boards/atlflight/eagle/default.cmake
index 3fff2b1602807989c6f22fa6716b90c3cf773052..0577ba02001ab01bb538f07bb50c5685fbb44fe1 100644
--- a/boards/atlflight/eagle/default.cmake
+++ b/boards/atlflight/eagle/default.cmake
@@ -83,7 +83,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		simulator
 		vmount
diff --git a/boards/atlflight/eagle/qurt-default.cmake b/boards/atlflight/eagle/qurt-default.cmake
index 9487b6fe76effb34301f0fb69680ead381657aba..3a04541198db98f3c82bb324fe1bc65bf4a5f1f8 100644
--- a/boards/atlflight/eagle/qurt-default.cmake
+++ b/boards/atlflight/eagle/qurt-default.cmake
@@ -73,7 +73,6 @@ px4_add_board(
 		local_position_estimator
 		mc_att_control
 		mc_pos_control
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/atlflight/excelsior/default.cmake b/boards/atlflight/excelsior/default.cmake
index 5304fd6d5ddd292a8ef80c113e2d55e087118839..59a919975874c363591180bed8ea65743ab6bc26 100644
--- a/boards/atlflight/excelsior/default.cmake
+++ b/boards/atlflight/excelsior/default.cmake
@@ -83,7 +83,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		simulator
 		vmount
@@ -118,6 +117,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/atlflight/excelsior/qurt-default.cmake b/boards/atlflight/excelsior/qurt-default.cmake
index 461bfd109fb23d986bbcd759b60ee0755cbf7e37..18c7e35701be43f14d974abc5a09305a8614968b 100644
--- a/boards/atlflight/excelsior/qurt-default.cmake
+++ b/boards/atlflight/excelsior/qurt-default.cmake
@@ -73,7 +73,6 @@ px4_add_board(
 		local_position_estimator
 		mc_att_control
 		mc_pos_control
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/auav/x21/default.cmake b/boards/auav/x21/default.cmake
index 75211277844bd8ebe1eabb76330da2913766072f..cbcdc5e1094dd5cd0f16b2a28ee36f46d1d85bf1 100644
--- a/boards/auav/x21/default.cmake
+++ b/boards/auav/x21/default.cmake
@@ -72,7 +72,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -110,6 +109,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/av/x-v1/default.cmake b/boards/av/x-v1/default.cmake
index 087278b0b64b3ca9a93f47b333fe1a7daa566aba..91011240be8992fb8d8d3ae66ade7a852d922ef5 100644
--- a/boards/av/x-v1/default.cmake
+++ b/boards/av/x-v1/default.cmake
@@ -72,7 +72,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -109,6 +108,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/beaglebone/blue/cross.cmake b/boards/beaglebone/blue/cross.cmake
index b4d6c4f1c973733c044968230e2fb5c26d130a9a..dc90d12389c3e15f4a373574a5d37c9cb8f6302d 100644
--- a/boards/beaglebone/blue/cross.cmake
+++ b/boards/beaglebone/blue/cross.cmake
@@ -47,7 +47,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -74,6 +73,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/beaglebone/blue/native.cmake b/boards/beaglebone/blue/native.cmake
index 41bc1e92c25ec9632ac4ba9dcc42567c28861b3f..60fd5f0ea7a1e75e66bfad6fee476e2a62fc9e00 100644
--- a/boards/beaglebone/blue/native.cmake
+++ b/boards/beaglebone/blue/native.cmake
@@ -45,7 +45,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -72,6 +71,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/bitcraze/crazyflie/default.cmake b/boards/bitcraze/crazyflie/default.cmake
index e9cebfcf8e58199fb1858b18bfcf4aaa68959610..3cf7b87cd14927c5326113eefd69326335f4ef58 100644
--- a/boards/bitcraze/crazyflie/default.cmake
+++ b/boards/bitcraze/crazyflie/default.cmake
@@ -36,7 +36,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#vtol_att_control
 		wind_estimator
diff --git a/boards/emlid/navio2/cross.cmake b/boards/emlid/navio2/cross.cmake
index f3a5044acb3c598016f850b42e5aab707bb0fbd9..101443b7e8b0da9510515725357afdf80e578c77 100644
--- a/boards/emlid/navio2/cross.cmake
+++ b/boards/emlid/navio2/cross.cmake
@@ -51,7 +51,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -82,6 +81,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/emlid/navio2/native.cmake b/boards/emlid/navio2/native.cmake
index b5a4a7034bfcf40886e90643b2e612cbe02e63af..5165ecddcf845a9e2bd1fa2d8d671f7d54a8f81e 100644
--- a/boards/emlid/navio2/native.cmake
+++ b/boards/emlid/navio2/native.cmake
@@ -49,7 +49,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -80,6 +79,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/intel/aerofc-v1/default.cmake b/boards/intel/aerofc-v1/default.cmake
index 6501a365bd2d8944043e32691011ea58b346b201..b8cf95c7ef5db1fe55c495f6a7404e90fd90ce5d 100644
--- a/boards/intel/aerofc-v1/default.cmake
+++ b/boards/intel/aerofc-v1/default.cmake
@@ -52,7 +52,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		#vtol_att_control
diff --git a/boards/intel/aerofc-v1/rtps.cmake b/boards/intel/aerofc-v1/rtps.cmake
index a2654160fc2f1f8cd04f9b77e8635635693b2b89..565871b8dc5a923cb86660e1644aee3ea1af1b95 100644
--- a/boards/intel/aerofc-v1/rtps.cmake
+++ b/boards/intel/aerofc-v1/rtps.cmake
@@ -55,7 +55,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		#vtol_att_control
diff --git a/boards/nxp/fmuk66-v3/default.cmake b/boards/nxp/fmuk66-v3/default.cmake
index 1691e0606d9bc6776f07676f6b910957cee75186..32a55823f711308c0566afb51dfbf1355158b8e2 100644
--- a/boards/nxp/fmuk66-v3/default.cmake
+++ b/boards/nxp/fmuk66-v3/default.cmake
@@ -68,7 +68,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -106,6 +105,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/omnibus/f4sd/default.cmake b/boards/omnibus/f4sd/default.cmake
index 612f52b8592b4f2715d07fd9f5323da43bc9fc42..9ffd3229658e2d1fb56a1e4bd5ed18ada6279813 100644
--- a/boards/omnibus/f4sd/default.cmake
+++ b/boards/omnibus/f4sd/default.cmake
@@ -63,7 +63,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		#vmount
 		#vtol_att_control
diff --git a/boards/parrot/bebop/default.cmake b/boards/parrot/bebop/default.cmake
index 5d6174a0f4d3fdc046f8abae09cba7f79bf94afa..5f38f34443befb2e5fe3f07f71b5fc37c1c02b59 100644
--- a/boards/parrot/bebop/default.cmake
+++ b/boards/parrot/bebop/default.cmake
@@ -39,7 +39,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#vtol_att_control
 		wind_estimator
diff --git a/boards/px4/fmu-v2/default.cmake b/boards/px4/fmu-v2/default.cmake
index c83e2ae975a720808017cd7647812a1732827ace..f0caa15da599f44a9c7d4f0533778ab8001f36cb 100644
--- a/boards/px4/fmu-v2/default.cmake
+++ b/boards/px4/fmu-v2/default.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -114,10 +113,13 @@ px4_add_board(
 		#fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		#hello
 		#hwtest # Hardware test
+		#matlab_csv_serial
+		#position_estimator_inav
 		#px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		#px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		#rover_steering_control # Rover example app
 		#segway
+		#uuv_example_app
 	)
 
 # remove optional flight task features from fmu-v2 to save flash memory
diff --git a/boards/px4/fmu-v2/lpe.cmake b/boards/px4/fmu-v2/lpe.cmake
index b73a9e1c2141997ce49c9ddd458f14c7d26f6d82..a22d130b4c7d23303e8cf481a39e618b84da14b2 100644
--- a/boards/px4/fmu-v2/lpe.cmake
+++ b/boards/px4/fmu-v2/lpe.cmake
@@ -77,7 +77,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		#vtol_att_control
diff --git a/boards/px4/fmu-v2/test.cmake b/boards/px4/fmu-v2/test.cmake
index 0a33abc9bde15e800955726ad80f8a69cb08c725..05005cd86e5ac51e2d70d05b7c07d410c24e6723 100644
--- a/boards/px4/fmu-v2/test.cmake
+++ b/boards/px4/fmu-v2/test.cmake
@@ -78,7 +78,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		#position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake
index 505edbefb45aea081e7a45be9778f4b12d2e924d..4c6dfdea02c6c05a87ca39f5a866c007b64f20b0 100644
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -118,6 +117,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v3/rtps.cmake b/boards/px4/fmu-v3/rtps.cmake
index 532767854d91563a79ef0cec0a100d4b518ff90a..f6750853a8a07f7bb733c1132b6e625e534d19c3 100644
--- a/boards/px4/fmu-v3/rtps.cmake
+++ b/boards/px4/fmu-v3/rtps.cmake
@@ -81,7 +81,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -119,6 +118,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v3/stackcheck.cmake b/boards/px4/fmu-v3/stackcheck.cmake
index 3393ba784aa4cfeb964f92f0dbccbcd47d869513..ea97d34d213e2d3137b682da12e09f377809ae02 100644
--- a/boards/px4/fmu-v3/stackcheck.cmake
+++ b/boards/px4/fmu-v3/stackcheck.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/px4/fmu-v4/default.cmake b/boards/px4/fmu-v4/default.cmake
index d5551363bb666144d0cde00352999db4c6be0024..eae8984084c87f1daaa38a2b24bbab4fda4a4b0f 100644
--- a/boards/px4/fmu-v4/default.cmake
+++ b/boards/px4/fmu-v4/default.cmake
@@ -65,7 +65,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -103,6 +102,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v4/rtps.cmake b/boards/px4/fmu-v4/rtps.cmake
index 50500658e4c50e1c251c127128ec25f3f81a3cd8..10295c62bc9f848e5df4309ea8d2a445e01627f3 100644
--- a/boards/px4/fmu-v4/rtps.cmake
+++ b/boards/px4/fmu-v4/rtps.cmake
@@ -67,7 +67,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -105,6 +104,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v4/stackcheck.cmake b/boards/px4/fmu-v4/stackcheck.cmake
index 9ea14e5c40ce696c6058ce3bca99173e5811a299..f0b8f438e5f67ddf20caf0fc3e552a56e12ff653 100644
--- a/boards/px4/fmu-v4/stackcheck.cmake
+++ b/boards/px4/fmu-v4/stackcheck.cmake
@@ -65,7 +65,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
diff --git a/boards/px4/fmu-v4pro/default.cmake b/boards/px4/fmu-v4pro/default.cmake
index d74323832c3f70905cc89541f4729c75cd4e4cfc..6a7f18ab082c76d3c036b52e086532aa70b50e16 100644
--- a/boards/px4/fmu-v4pro/default.cmake
+++ b/boards/px4/fmu-v4pro/default.cmake
@@ -79,7 +79,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -117,6 +116,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v4pro/rtps.cmake b/boards/px4/fmu-v4pro/rtps.cmake
index 6e64151e5ce28a54ce884141df9ac361a5b8a37c..b59b88f76acd226387e757fc1c6f7cf87764e4df 100644
--- a/boards/px4/fmu-v4pro/rtps.cmake
+++ b/boards/px4/fmu-v4pro/rtps.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -118,6 +117,7 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake
index 06257d1db4af3c193eb5ce9c343c037f1230ef4c..a7ce965eacbee3cc8ebe0bb9f79ef1db8bc588cf 100644
--- a/boards/px4/fmu-v5/default.cmake
+++ b/boards/px4/fmu-v5/default.cmake
@@ -3,6 +3,7 @@ px4_add_board(
 	PLATFORM nuttx
 	VENDOR px4
 	MODEL fmu-v5
+	LABEL default
 	TOOLCHAIN arm-none-eabi
 	ARCHITECTURE cortex-m7
 	ROMFSROOT px4fmu_common
@@ -79,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -117,10 +117,10 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
 		segway
 		uuv_example_app
-
 	)
diff --git a/boards/px4/fmu-v5/rtps.cmake b/boards/px4/fmu-v5/rtps.cmake
index bc96541d60708ba653e4e62299c25961533158bf..072caad7b445aae4d8df8cbe7b15ae8f29e4bf34 100644
--- a/boards/px4/fmu-v5/rtps.cmake
+++ b/boards/px4/fmu-v5/rtps.cmake
@@ -81,7 +81,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -119,10 +118,10 @@ px4_add_board(
 		hello
 		hwtest # Hardware test
 		#matlab_csv_serial
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
 		segway
 		uuv_example_app
-
 	)
diff --git a/boards/px4/fmu-v5/stackcheck.cmake b/boards/px4/fmu-v5/stackcheck.cmake
index 5879d5a86b99bfdf8f3c8b8a2adedc757ce19f10..d36b11f2384ee288cde9721f85fed161d4b4dd9a 100644
--- a/boards/px4/fmu-v5/stackcheck.cmake
+++ b/boards/px4/fmu-v5/stackcheck.cmake
@@ -80,7 +80,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -123,5 +122,4 @@ px4_add_board(
 		#rover_steering_control # Rover example app
 		#segway
 		#uuv_example_app
-
 	)
diff --git a/boards/px4/raspberrypi/cross.cmake b/boards/px4/raspberrypi/cross.cmake
index 4627b829b44f527e17328ff30313bfe426af9653..a907a81eb1819bdd09cba1c7d62c18bbc06fff53 100644
--- a/boards/px4/raspberrypi/cross.cmake
+++ b/boards/px4/raspberrypi/cross.cmake
@@ -44,7 +44,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		vmount
 		vtol_att_control
@@ -74,6 +73,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/raspberrypi/native.cmake b/boards/px4/raspberrypi/native.cmake
index d3cc473f95af5ace565022ca0164ae6bc48a787f..7ebce9eff6dd2e0504443c7bcb9ed73c9724be11 100644
--- a/boards/px4/raspberrypi/native.cmake
+++ b/boards/px4/raspberrypi/native.cmake
@@ -42,7 +42,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		sensors
 		#simulator
 		vmount
@@ -73,6 +72,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake
index 51cb4b4a9ad372b6728ca3b446253a18f77549a0..2ed686e887c3f4d1301cf89ad197ddae30a7749d 100644
--- a/boards/px4/sitl/default.cmake
+++ b/boards/px4/sitl/default.cmake
@@ -40,7 +40,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		replay
 		sensors
 		simulator
@@ -78,6 +77,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/sitl/rtps.cmake b/boards/px4/sitl/rtps.cmake
index f68fcec7c993520ccdbaeea1c3ecbe8ec174ffd6..a34d7641366cba6cf0875b39d7652ea4f3656e28 100644
--- a/boards/px4/sitl/rtps.cmake
+++ b/boards/px4/sitl/rtps.cmake
@@ -41,7 +41,6 @@ px4_add_board(
 		mc_pos_control
 		micrortps_bridge
 		navigator
-		position_estimator_inav
 		replay
 		sensors
 		simulator
@@ -79,6 +78,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/boards/px4/sitl/test.cmake b/boards/px4/sitl/test.cmake
index 4c92a02f26350bb1ac6107d91bc9e75be15582bb..65ab15ecf45ad000836ca06b65136f8f3f099806 100644
--- a/boards/px4/sitl/test.cmake
+++ b/boards/px4/sitl/test.cmake
@@ -40,7 +40,6 @@ px4_add_board(
 		mc_att_control
 		mc_pos_control
 		navigator
-		position_estimator_inav
 		replay
 		sensors
 		simulator
@@ -78,6 +77,7 @@ px4_add_board(
 		fixedwing_control # Tutorial code from https://px4.io/dev/example_fixedwing_control
 		hello
 		#hwtest # Hardware test
+		position_estimator_inav
 		px4_mavlink_debug # Tutorial code from https://px4.io/dev/debug_values
 		px4_simple_app # Tutorial code from https://px4.io/dev/px4_simple_app
 		rover_steering_control # Rover example app
diff --git a/platforms/qurt/src/px4_layer/commands_hil.c b/platforms/qurt/src/px4_layer/commands_hil.c
index a2f6629a51aeab3c4ee51084ca2f216f1fe280ab..ebc7688244a6d58c337558beed8a25ee2f54e23d 100644
--- a/platforms/qurt/src/px4_layer/commands_hil.c
+++ b/platforms/qurt/src/px4_layer/commands_hil.c
@@ -51,8 +51,7 @@ const char *get_commands()
 //		"tone_alarm start\n"
 		"commander start --hil\n"
 		"sensors start\n"
-		"attitude_estimator_q start\n"
-		"position_estimator_inav start\n"
+		"ekf2 start\n"
 		"mc_pos_control start\n"
 		"mc_att_control start\n"
 		"sleep 1\n"
diff --git a/posix-configs/eagle/hil/px4.config b/posix-configs/eagle/hil/px4.config
index 2f1977396fa5a11e9836ce8e0f2f6d711b3beb4a..1dcb1fb9e085e140f6b6b2fcdade8103c09222ac 100644
--- a/posix-configs/eagle/hil/px4.config
+++ b/posix-configs/eagle/hil/px4.config
@@ -41,8 +41,7 @@ param set SYS_MC_EST_GROUP 0
 sleep 1
 commander start -hil
 sensors start
-attitude_estimator_q start
-position_estimator_inav start
+ekf2 start
 mc_pos_control start
 mc_att_control start
 land_detector start multicopter
diff --git a/posix-configs/rpi/px4_no_shield.config b/posix-configs/rpi/px4_no_shield.config
index 3bc9cbeee1be7885e34d828760dfc2b20b84cadf..2afb474c3716ddf2c0bc045cff0a18017758fa44 100644
--- a/posix-configs/rpi/px4_no_shield.config
+++ b/posix-configs/rpi/px4_no_shield.config
@@ -19,8 +19,7 @@ df_ms5611_wrapper start
 gps start -d /dev/ttyACM0 -i uart -p ubx
 sensors start
 commander start
-attitude_estimator_q start
-position_estimator_inav start
+ekf2 start
 land_detector start multicopter
 mc_pos_control start
 mc_att_control start
diff --git a/src/modules/position_estimator_inav/CMakeLists.txt b/src/examples/position_estimator_inav/CMakeLists.txt
similarity index 100%
rename from src/modules/position_estimator_inav/CMakeLists.txt
rename to src/examples/position_estimator_inav/CMakeLists.txt
diff --git a/src/modules/position_estimator_inav/inertial_filter.cpp b/src/examples/position_estimator_inav/inertial_filter.cpp
similarity index 100%
rename from src/modules/position_estimator_inav/inertial_filter.cpp
rename to src/examples/position_estimator_inav/inertial_filter.cpp
diff --git a/src/modules/position_estimator_inav/inertial_filter.h b/src/examples/position_estimator_inav/inertial_filter.h
similarity index 100%
rename from src/modules/position_estimator_inav/inertial_filter.h
rename to src/examples/position_estimator_inav/inertial_filter.h
diff --git a/src/modules/position_estimator_inav/params.c b/src/examples/position_estimator_inav/params.c
similarity index 100%
rename from src/modules/position_estimator_inav/params.c
rename to src/examples/position_estimator_inav/params.c
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_main.cpp b/src/examples/position_estimator_inav/position_estimator_inav_main.cpp
similarity index 100%
rename from src/modules/position_estimator_inav/position_estimator_inav_main.cpp
rename to src/examples/position_estimator_inav/position_estimator_inav_main.cpp
diff --git a/src/modules/position_estimator_inav/position_estimator_inav_params.h b/src/examples/position_estimator_inav/position_estimator_inav_params.h
similarity index 100%
rename from src/modules/position_estimator_inav/position_estimator_inav_params.h
rename to src/examples/position_estimator_inav/position_estimator_inav_params.h