diff --git a/backup-partition.rsc b/backup-partition.rsc
index 5d131c9..0eaf166 100644
--- a/backup-partition.rsc
+++ b/backup-partition.rsc
@@ -31,11 +31,11 @@ $ScriptLock $0;
 :local FallbackTo [ /partitions/get $ActiveRunning fallback-to ];
 
 :do {
-  /system/scheduler/add start-time=startup \
-      name=("running-from-" . $FallbackTo) \
-      on-event=(":log warning \"Running from partition '" . $FallbackTo . "'!");
+  /system/scheduler/add start-time=startup name="running-from-backup-partition" \
+      on-event=(":log warning (\"Running from partition '\" . " . \
+      "[ /partitions/get [ find where running ] name ] . \"'!\")");
   /partitions/save-config-to $FallbackTo;
-  /system/scheduler/remove ("running-from-" . $FallbackTo);
+  /system/scheduler/remove "running-from-backup-partition";
   $LogPrintExit2 info $0 ("Saved configuration to partition '" . \
       $FallbackTo . "'.") false;
 } on-error={