diff --git a/source/getting-started/z-wave-device-specific.markdown b/source/getting-started/z-wave-device-specific.markdown
index ac53854e1c2..55aab52cc66 100644
--- a/source/getting-started/z-wave-device-specific.markdown
+++ b/source/getting-started/z-wave-device-specific.markdown
@@ -29,13 +29,13 @@ You can use this for automations.
 
 Example:
 ```yaml
-- alias: Minimote Button Pressed
-  trigger:
-    platform: event
-    event_type: zwave.basic_level
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      basic_level: 255
+ - alias: Minimote Button Pressed
+   trigger:
+     platform: event
+     event_type: zwave.basic_level
+     event_data:
+       object_id: aeon_labs_minimote_1
+       basic_level: 255
 ```
 
 ##### {% linkable_title Event scene_id for automation %}
@@ -44,13 +44,14 @@ This can be a press of a button, so tests have to be made to determine what scen
 You can use this for automations.
 
 Example:
+
 ```yaml
-- alias: Minimote Button 1 Pressed
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
+ - alias: Minimote Button 1 Pressed
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
       scene_id: 1
 ```
 
@@ -60,67 +61,67 @@ Example:
 Here's a handy configuration for the Aeon Labs Minimote that defines all possible button presses. Put it into `automation.yaml`.
 
 ```yaml
-- alias: Minimote Button 1 Pressed
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 1
+ - alias: Minimote Button 1 Pressed
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 1
 
-- alias: Minimote Button 1 Held
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 2
+ - alias: Minimote Button 1 Held
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 2
 
-- alias: Minimote Button 2 Pressed
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 3
+ - alias: Minimote Button 2 Pressed
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 3
 
-- alias: Minimote Button 2 Held
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 4
+ - alias: Minimote Button 2 Held
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 4
 
-- alias: Minimote Button 3 Pressed
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 5
+ - alias: Minimote Button 3 Pressed
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 5
 
-- alias: Minimote Button 3 Held
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 6
+ - alias: Minimote Button 3 Held
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 6
 
-- alias: Minimote Button 4 Pressed
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 7
+ - alias: Minimote Button 4 Pressed
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 7
 
-- alias: Minimote Button 4 Held
-  trigger:
-    platform: event
-    event_type: zwave.scene_activated
-    event_data:
-      entity_id: aeon_labs_minimote_1
-      scene_id: 8
+ - alias: Minimote Button 4 Held
+   trigger:
+     platform: event
+     event_type: zwave.scene_activated
+     event_data:
+       object_id: aeon_labs_minimote_1
+       scene_id: 8
 ```