diff --git a/Makefile b/Makefile
index 096a058653..b0f49eda3e 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ clean:
 # targets handled by cmake
 cmake_targets = test upload package package_source debug debug_tui debug_ddd debug_io debug_io_tui debug_io_ddd check_weak \
 	run_cmake_config config gazebo gazebo_gdb gazebo_lldb jmavsim \
-	jmavsim_gdb jmavsim_lldb gazebo_gdb_iris gazebo_lldb_vtol gazebo_iris gazebo_vtol
+	jmavsim_gdb jmavsim_lldb gazebo_gdb_iris gazebo_lldb_tailsitter gazebo_iris gazebo_tailsitter
 $(foreach targ,$(cmake_targets),$(eval $(call cmake-targ,$(targ))))
 
 .PHONY: clean
diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh
index 8767f9f841..7dee02868a 100755
--- a/Tools/sitl_run.sh
+++ b/Tools/sitl_run.sh
@@ -88,9 +88,9 @@ then
 	ddd --debugger gdb --args mainapp ../../../../${rc_script}_${program}
 elif [ "$debugger" == "valgrind" ]
 then
-	valgrind ./mainapp ../../../../${rc_script}_${program}
+	valgrind ./mainapp ../../../../${rc_script}_${program}_${model}
 else
-	./mainapp ../../../../${rc_script}_${program}
+	./mainapp ../../../../${rc_script}_${program}_${model}
 fi
 
 if [ "$program" == "jmavsim" ]
diff --git a/src/firmware/posix/CMakeLists.txt b/src/firmware/posix/CMakeLists.txt
index fb7490ffe2..efc81d6335 100644
--- a/src/firmware/posix/CMakeLists.txt
+++ b/src/firmware/posix/CMakeLists.txt
@@ -34,7 +34,7 @@ add_dependencies(run_config mainapp)
 
 foreach(viewer none jmavsim gazebo)
 	foreach(debugger none gdb lldb ddd valgrind)
-		foreach(model none iris vtol)
+		foreach(model none iris tailsitter)
 			if (debugger STREQUAL "none")
 				if (model STREQUAL "none")
 					set(_targ_name "${viewer}")