diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh
index f13ed94509..fff0080ca9 100755
--- a/Tools/sitl_run.sh
+++ b/Tools/sitl_run.sh
@@ -68,12 +68,12 @@ touch rootfs/eeprom/parameters
 # Start Java simulator
 if [ "$debugger" == "lldb" ]
 then
-	lldb -- mainapp ../../../../$rc_script
+	lldb -- mainapp ../../../../${rc_script}_${program}
 elif [ "$debugger" == "gdb" ]
 then
-	gdb --args mainapp ../../../../$rc_script
+	gdb --args mainapp ../../../../${rc_script}_${program}
 else
-	./mainapp ../../../../$rc_script
+	./mainapp ../../../../${rc_script}_${program}
 fi
 
 if [ "$3" == "jmavsim" ]
diff --git a/posix-configs/SITL/init/rcS_iris_gazebo b/posix-configs/SITL/init/rcS_gazebo
similarity index 100%
rename from posix-configs/SITL/init/rcS_iris_gazebo
rename to posix-configs/SITL/init/rcS_gazebo
diff --git a/posix-configs/SITL/init/rcS b/posix-configs/SITL/init/rcS_jmavsim
similarity index 100%
rename from posix-configs/SITL/init/rcS
rename to posix-configs/SITL/init/rcS_jmavsim