diff --git a/scripts.yaml b/scripts.yaml
index 09281b2..38610a7 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -3,9 +3,9 @@ inside_all_on: !include scripts/inside_all_on.yaml
 outside_all_on: !include scripts/outside_all_on.yaml
 inside_all_off: !include scripts/inside_all_off.yaml
 outside_all_off: !include scripts/outside_all_off.yaml
-jeff_is_driving: !include scripts/jeff_is_driving.yaml
+jeff_is_moving: !include scripts/jeff_is_moving.yaml
 jeff_is_stationary: !include scripts/jeff_is_stationary.yaml
 jeff_unknown: !include scripts/jeff_unknown.yaml
-kat_is_driving: !include scripts/kat_is_driving.yaml
+kat_is_moving: !include scripts/kat_is_moving.yaml
 kat_is_stationary: !include scripts/kat_is_stationary.yaml
 kat_unknown: !include scripts/kat_unknown.yaml
diff --git a/scripts/jeff_is_driving.yaml b/scripts/jeff_is_moving.yaml
similarity index 74%
rename from scripts/jeff_is_driving.yaml
rename to scripts/jeff_is_moving.yaml
index a83d164..55c2147 100644
--- a/scripts/jeff_is_driving.yaml
+++ b/scripts/jeff_is_moving.yaml
@@ -2,8 +2,8 @@ sequence:
 - event: LOGBOOK_ENTRY
   event_data:
     name: EVENT
-    message: "Jeff is Driving"
+    message: "Jeff is Moving"
 - service: input_select.select_option
   data:
     entity_id: input_select.jeff_status
-    option: driving
+    option: moving
diff --git a/scripts/kat_is_driving.yaml b/scripts/kat_is_moving.yaml
similarity index 74%
rename from scripts/kat_is_driving.yaml
rename to scripts/kat_is_moving.yaml
index 725276e..a3894ce 100644
--- a/scripts/kat_is_driving.yaml
+++ b/scripts/kat_is_moving.yaml
@@ -2,8 +2,8 @@ sequence:
 - event: LOGBOOK_ENTRY
   event_data:
     name: EVENT
-    message: "Kat is Driving"
+    message: "Kat is Moving"
 - service: input_select.select_option
   data:
     entity_id: input_select.kat_status
-    option: driving
+    option: moving