diff --git a/cmake/configs/posix_sitl_default.cmake b/cmake/configs/posix_sitl_default.cmake
index 276b1f20c1..2d7d6d2904 100644
--- a/cmake/configs/posix_sitl_default.cmake
+++ b/cmake/configs/posix_sitl_default.cmake
@@ -151,7 +151,8 @@ set(config_module_list
 
 	#
 	# HippoCampus example (AUV from TUHH)
-	examples/auv_hippocampus_example_app
+	#
+	examples/uuv_example_app
 
 	#
 	# Segway
diff --git a/posix-configs/SITL/init/ekf2/hippocampus b/posix-configs/SITL/init/ekf2/hippocampus
index 7330d93283..e932a05da9 100644
--- a/posix-configs/SITL/init/ekf2/hippocampus
+++ b/posix-configs/SITL/init/ekf2/hippocampus
@@ -30,7 +30,6 @@ ekf2 start
 mavlink start -u 14556 -r 4000000
 mavlink start -u 14557 -r 4000000 -m onboard -o 14540
 mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u 14556
-mavlink stream -r 50 -s ATT_POS_MOCAP -u 14556
 mavlink stream -r 50 -s LOCAL_POSITION_NED -u 14556
 
 logger start -r 100 -e
diff --git a/posix-configs/SITL/init/lpe/hippocampus b/posix-configs/SITL/init/lpe/hippocampus
index 3490edbe08..e382756077 100644
--- a/posix-configs/SITL/init/lpe/hippocampus
+++ b/posix-configs/SITL/init/lpe/hippocampus
@@ -30,7 +30,7 @@ attitude_estimator_q start
 mavlink start -u 14556 -r 4000000
 mavlink start -u 14557 -r 4000000 -m onboard -o 14540
 mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u 14556
-mavlink stream -r 50 -s ATT_POS_MOCAP -u 14556
 mavlink stream -r 50 -s LOCAL_POSITION_NED -u 14556
+
 logger start -r 100 -e
 mavlink boot_complete
diff --git a/src/examples/auv_hippocampus_example_app/CMakeLists.txt b/src/examples/uuv_example_app/CMakeLists.txt
similarity index 94%
rename from src/examples/auv_hippocampus_example_app/CMakeLists.txt
rename to src/examples/uuv_example_app/CMakeLists.txt
index a66a0b693a..552ffb26dd 100644
--- a/src/examples/auv_hippocampus_example_app/CMakeLists.txt
+++ b/src/examples/uuv_example_app/CMakeLists.txt
@@ -31,11 +31,11 @@
 #
 ############################################################################
 px4_add_module(
-	MODULE examples__auv_hippocampus_example_app
-	MAIN auv_hippocampus_example_app
+	MODULE examples__uuv_example_app
+	MAIN uuv_example_app
 	STACK_MAIN 2000
 	SRCS
-		auv_hippocampus_example_app.cpp
+		uuv_example_app.cpp
 	DEPENDS
 		platforms__common
 	)
diff --git a/src/examples/auv_hippocampus_example_app/auv_hippocampus_example_app.cpp b/src/examples/uuv_example_app/uuv_example_app.cpp
similarity index 95%
rename from src/examples/auv_hippocampus_example_app/auv_hippocampus_example_app.cpp
rename to src/examples/uuv_example_app/uuv_example_app.cpp
index cb09936d3a..7a3a763181 100644
--- a/src/examples/auv_hippocampus_example_app/auv_hippocampus_example_app.cpp
+++ b/src/examples/uuv_example_app/uuv_example_app.cpp
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /**
- * @file hippocampus_example_app.cpp
+ * @file uuv_example_app.cpp
  *
  * This file let the hippocampus drive in a circle and prints the orientation as well as the acceleration data.
  * The HippoCampus is an autonomous underwater vehicle (AUV) designed by the Technical University Hamburg-Harburg (TUHH).
@@ -59,7 +59,6 @@
 // internal libraries
 #include <lib/mathlib/mathlib.h>
 #include <lib/geo/geo.h>
-#include <lib/tailsitter_recovery/tailsitter_recovery.h>
 
 // Include uORB and the required topics for this app
 #include <uORB/uORB.h>
@@ -67,9 +66,9 @@
 #include <uORB/topics/actuator_controls.h>              // this topic gives the actuators control input
 #include <uORB/topics/control_state.h>                  // this topic holds the orientation of the hippocampus
 
-extern "C" __EXPORT int auv_hippocampus_example_app_main(int argc, char *argv[]);
+extern "C" __EXPORT int uuv_example_app_main(int argc, char *argv[]);
 
-int auv_hippocampus_example_app_main(int argc, char *argv[])
+int uuv_example_app_main(int argc, char *argv[])
 {
 	PX4_INFO("auv_hippocampus_example_app has been started!");
 
@@ -122,7 +121,7 @@ int auv_hippocampus_example_app_main(int argc, char *argv[])
 				/* copy sensors raw data into local buffer */
 				orb_copy(ORB_ID(sensor_combined), sensor_sub_fd, &raw_sensor);
 				// printing the sensor data into the terminal
-				PX4_INFO("Accelerometer:\t%8.4f\t%8.4f\t%8.4f",
+				PX4_INFO("Acc:\t%8.4f\t%8.4f\t%8.4f",
 					 (double)raw_sensor.accelerometer_m_s2[0],
 					 (double)raw_sensor.accelerometer_m_s2[1],
 					 (double)raw_sensor.accelerometer_m_s2[2]);
@@ -171,7 +170,7 @@ int auv_hippocampus_example_app_main(int argc, char *argv[])
 	}
 
 
-	PX4_INFO("exiting auv_hippocampus_example_app!");
+	PX4_INFO("Exiting uuv_example_app!");
 
 
 	return 0;