diff --git a/config/automation/away.yaml b/config/automation/away.yaml
index a9fa51bf..179094c4 100755
--- a/config/automation/away.yaml
+++ b/config/automation/away.yaml
@@ -5,8 +5,8 @@
 - alias: 'Away Mode'
   trigger:
     - platform: state
-      entity_id: binary_sensor.downstairs_away_mode
-      to: 'True'
+      entity_id: binary_sensor.downstairs_nest_away
+      to: 'off'
     - platform: state
       entity_id: group.family
       to: 'not_home'
diff --git a/config/automation/late_night_helper.yaml b/config/automation/late_night_helper.yaml
index 0e9edbf0..5c249d5c 100755
--- a/config/automation/late_night_helper.yaml
+++ b/config/automation/late_night_helper.yaml
@@ -6,11 +6,11 @@
 - alias: 'Late Night Helper'
   trigger:
     - platform: state
-      entity_id: binary_sensor.downstairs_away_mode
-      to: 'False'
+      entity_id: binary_sensor.downstairs_nest_away
+      to: 'off'
     - platform: state
       entity_id: group.family
-      to: home
+      to: 'home'
 
   condition:
     condition: and
diff --git a/config/automation/upstairs_motion_ifttt.yaml b/config/automation/upstairs_motion_ifttt.yaml
index 4db14f3b..19a6cb8c 100755
--- a/config/automation/upstairs_motion_ifttt.yaml
+++ b/config/automation/upstairs_motion_ifttt.yaml
@@ -5,8 +5,8 @@
     - platform: event
       event_type: upstairs_light_on
     - platform: state
-      entity_id: sensor.upstairs_away_mode
-      to: 'False'
+      entity_id: binary_sensor.upstairs_nest_away
+      to: 'off'
 
   condition:
     - condition: state
@@ -24,8 +24,8 @@
     - platform: event
       event_type: upstairs_light_off
     - platform: state
-      entity_id: sensor.upstairs_away_mode
-      to: 'True'
+      entity_id: binary_sensor.upstairs_nest_away
+      to: 'on'
 
   action:
     service: light.turn_off
diff --git a/config/sensor/nest.yaml b/config/sensor/nest.yaml.DELETEME
similarity index 100%
rename from config/sensor/nest.yaml
rename to config/sensor/nest.yaml.DELETEME