diff --git a/repos/os/run/failsafe.run b/repos/os/run/fault_detection.run
similarity index 76%
rename from repos/os/run/failsafe.run
rename to repos/os/run/fault_detection.run
index 9cbc7688e..6241ef65f 100644
--- a/repos/os/run/failsafe.run
+++ b/repos/os/run/fault_detection.run
@@ -13,8 +13,8 @@ if {[have_spec fiasco]} {
 	#
 	# The L4/Fiasco kernel has known problems with the destruction of threads
 	# that are currently participating in IPC (the "red-thread issue"). The
-	# failsafe test reliably triggers the problem. Since the development of
-	# the kernel has been stopped, however, this issue is expected to remain
+	# fault-detection test reliably triggers the problem. Since the development
+	# of the kernel has been stopped, however, this issue is expected to remain
 	# unresolved. Newer kernels such as Fiasco.OC do not have the problem.
 	#
 	exit 0
@@ -24,7 +24,7 @@ if {[have_spec fiasco]} {
 # Build
 #
 
-build { core init server/loader test/failsafe test/segfault }
+build { core init server/loader test/fault_detection test/segfault }
 
 create_boot_directory
 
@@ -51,7 +51,7 @@ install_config {
 			<resource name="RAM" quantum="10M"/>
 			<provides> <service name="Loader"/> </provides>
 		</start>
-		<start name="test-failsafe">
+		<start name="test-fault_detection">
 			<resource name="RAM" quantum="10M"/>
 		</start>
 	</config>
@@ -62,7 +62,7 @@ install_config {
 #
 
 # generic modules
-set boot_modules { core init loader test-failsafe test-segfault }
+set boot_modules { core init loader test-fault_detection test-segfault }
 
 build_boot_image $boot_modules
 
@@ -72,4 +72,4 @@ build_boot_image $boot_modules
 
 append qemu_args "-nographic -m 64"
 
-run_genode_until "--- finished failsafe test ---.*\n" 30
+run_genode_until "--- finished fault_detection test ---.*\n" 30
diff --git a/repos/os/src/test/failsafe/main.cc b/repos/os/src/test/fault_detection/main.cc
similarity index 95%
rename from repos/os/src/test/failsafe/main.cc
rename to repos/os/src/test/fault_detection/main.cc
index cdcdfd002..676d9e9db 100644
--- a/repos/os/src/test/failsafe/main.cc
+++ b/repos/os/src/test/fault_detection/main.cc
@@ -1,5 +1,5 @@
 /*
- * \brief  Test program for failsafe monitoring
+ * \brief  Test program for detecting faults
  * \author Norman Feske
  * \date   2013-01-03
  */
@@ -128,7 +128,7 @@ class Test_child : public Genode::Child_policy
 };
 
 
-void failsafe_child_test()
+void faulting_child_test()
 {
 	using namespace Genode;
 
@@ -180,7 +180,7 @@ void failsafe_child_test()
  ** Test for detecting failures in a child started by the loader **
  ******************************************************************/
 
-void failsafe_loader_child_test()
+void faulting_loader_child_test()
 {
 	using namespace Genode;
 
@@ -218,7 +218,7 @@ void failsafe_loader_child_test()
  ** Test for detecting failures in a grandchild started by the loader **
  ***********************************************************************/
 
-void failsafe_loader_grand_child_test()
+void faulting_loader_grand_child_test()
 {
 	using namespace Genode;
 
@@ -289,15 +289,15 @@ int main(int argc, char **argv)
 {
 	using namespace Genode;
 
-	printf("--- failsafe test started ---\n");
+	printf("--- fault_detection test started ---\n");
 
-	failsafe_child_test();
+	faulting_child_test();
 
-	failsafe_loader_child_test();
+	faulting_loader_child_test();
 
-	failsafe_loader_grand_child_test();
+	faulting_loader_grand_child_test();
 
-	printf("--- finished failsafe test ---\n");
+	printf("--- finished fault_detection test ---\n");
 	return 0;
 }
 
diff --git a/repos/os/src/test/failsafe/target.mk b/repos/os/src/test/fault_detection/target.mk
similarity index 50%
rename from repos/os/src/test/failsafe/target.mk
rename to repos/os/src/test/fault_detection/target.mk
index 55f67a79e..a62add275 100644
--- a/repos/os/src/test/failsafe/target.mk
+++ b/repos/os/src/test/fault_detection/target.mk
@@ -1,3 +1,3 @@
-TARGET = test-failsafe
+TARGET = test-fault_detection
 SRC_CC = main.cc
 LIBS   = base
diff --git a/tool/autopilot.list b/tool/autopilot.list
index 038ded6fe..26827c4df 100644
--- a/tool/autopilot.list
+++ b/tool/autopilot.list
@@ -19,7 +19,7 @@ lx_hybrid_exception
 lx_hybrid_pthread_ipc
 moon
 thread_join
-failsafe
+fault_detection
 netperf_lwip
 netperf_lwip_usb30
 netperf_lwip_bridge