diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk
index a5ff089..18d015e 100644
--- a/lib/make/mb_autoexec.mk
+++ b/lib/make/mb_autoexec.mk
@@ -85,14 +85,14 @@ endef
 MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_save_video,"Appends save video command.","<dir> [prefix]")
 
 define mb_autoexec_append_safe_test
-	$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_TEST_TIMEOUT)) seconds failed_test $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_TEST_EXITCODE)))
+	$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_TEST_TIMEOUT)) seconds err_test $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_TEST_EXITCODE)))
 	$(call mb_autoexec_append_echo,$(1),mb::safe test $(2))
 	$(call mb_autoexec_append_cmd,$(1),$(2))
 endef
 MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_safe_test,"Appends running a safe test.","<dir> <cmd> [timeout] [exit-code]")
 
 define mb_autoexec_append_safe_cmd
-	$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_CMD_TIMEOUT)) seconds failed_cmd $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_CMD_EXITCODE)))
+	$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_CMD_TIMEOUT)) seconds err_cmd $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_CMD_EXITCODE)))
 	$(call mb_autoexec_append_echo,$(1),mb::safe command $(2))
 	$(call mb_autoexec_append_cmd,$(1),$(2))
 endef
@@ -102,7 +102,7 @@ define _mb_autoexec_write_preboot
 	$(call mb_autoexec_append_cmd,$(1),$(2)mbboot80)
 	$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl boot_exec_color_vdp)
 	$(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_autoexec_append_save_video,$(1)))
-	$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
+	$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds err_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
 endef
 
 define mb_autoexec_write_default
diff --git a/lib/make/mb_msxpipe.mk b/lib/make/mb_msxpipe.mk
index 2674e30..2576ab3 100644
--- a/lib/make/mb_msxpipe.mk
+++ b/lib/make/mb_msxpipe.mk
@@ -20,7 +20,7 @@ define _mb_msxpipe_run_gui
 	$(call mb_autoexec_append_stop_fail,$(1))
 	$(call mb_autoexec_append_show_gui,$(1))
 	$(if $(filter mouse,$(4)),$(call mb_autoexec_append_joyporta_mouse,$(1)))
-	$(call mb_autoexec_append_echo,$(1),mb::help Run shutdown to stop emulation)
+	$(call mb_autoexec_append_echo,$(1),mb::help Run shutdown to exit)
 	$(if $(2),$(call mb_autoexec_append_echo,$(1),mb::show command $(2)))
 	$(if $(2),$(call mb_autoexec_append_cmd,$(1),$(2)))
 	$(call mb_openmsx_dosctl,$(1),$(3))
diff --git a/lib/openmsx/share/scripts/fail_after.tcl b/lib/openmsx/share/scripts/fail_after.tcl
index e8fd7b2..8ea3fdd 100644
--- a/lib/openmsx/share/scripts/fail_after.tcl
+++ b/lib/openmsx/share/scripts/fail_after.tcl
@@ -62,7 +62,7 @@ proc fail_after { timeout {time_unit "time"} {fail_id "fail_after"} {fail_code 2
 proc fail_after_reboot_watchdog {} {
 	global fail_after_boot_timeout
 	if {$fail_after_boot_timeout != 0} {
-		fail_after $fail_after_boot_timeout realtime failed_boot 124
+		fail_after $fail_after_boot_timeout realtime err_boot 124
 		after boot "fail_after_reboot_watchdog"
 	}
 }