diff --git a/homeassistant/components/automation/blueprints/motion_light.yaml b/homeassistant/components/automation/blueprints/motion_light.yaml
index ad9c6f0286b..11900708b19 100644
--- a/homeassistant/components/automation/blueprints/motion_light.yaml
+++ b/homeassistant/components/automation/blueprints/motion_light.yaml
@@ -35,24 +35,24 @@ blueprint:
 mode: restart
 max_exceeded: silent
 
-trigger:
-  platform: state
+triggers:
+  trigger: state
   entity_id: !input motion_entity
   from: "off"
   to: "on"
 
-action:
+actions:
   - alias: "Turn on the light"
-    service: light.turn_on
+    action: light.turn_on
     target: !input light_target
   - alias: "Wait until there is no motion from device"
     wait_for_trigger:
-      platform: state
+      trigger: state
       entity_id: !input motion_entity
       from: "on"
       to: "off"
   - alias: "Wait the number of seconds that has been set"
     delay: !input no_motion_wait
   - alias: "Turn off the light"
-    service: light.turn_off
+    action: light.turn_off
     target: !input light_target
diff --git a/homeassistant/components/automation/blueprints/notify_leaving_zone.yaml b/homeassistant/components/automation/blueprints/notify_leaving_zone.yaml
index e1e3bd5b2f6..e072aad2565 100644
--- a/homeassistant/components/automation/blueprints/notify_leaving_zone.yaml
+++ b/homeassistant/components/automation/blueprints/notify_leaving_zone.yaml
@@ -25,8 +25,8 @@ blueprint:
           filter:
             integration: mobile_app
 
-trigger:
-  platform: state
+triggers:
+  trigger: state
   entity_id: !input person_entity
 
 variables:
@@ -36,13 +36,13 @@ variables:
   person_entity: !input person_entity
   person_name: "{{ states[person_entity].name }}"
 
-condition:
+conditions:
   condition: template
   # The first case handles leaving the Home zone which has a special state when zoning called 'home'.
   # The second case handles leaving all other zones.
   value_template: "{{ zone_entity == 'zone.home' and trigger.from_state.state == 'home' and trigger.to_state.state != 'home' or trigger.from_state.state == zone_state and trigger.to_state.state != zone_state }}"
 
-action:
+actions:
   - alias: "Notify that a person has left the zone"
     domain: mobile_app
     type: notify