diff --git a/automation/holiday.yaml b/automation/holiday.yaml
index b70cda34..614ee924 100755
--- a/automation/holiday.yaml
+++ b/automation/holiday.yaml
@@ -11,10 +11,10 @@
               
   action:
     - service: switch.turn_on
-      entity_id: switch.outlet_den
+      entity_id: switch.den_outlet
     - delay: 00:00:30
     - service: switch.turn_on
-      entity_id: switch.outlet_living_room
+      entity_id: switch.living_room_outlet
     
 - alias: 'Holiday Stuff off'  
   trigger:
diff --git a/customize/switches.yaml b/customize/switches.yaml
index 028fcceb..cd9238a2 100755
--- a/customize/switches.yaml
+++ b/customize/switches.yaml
@@ -12,7 +12,7 @@ switch.living_room_amp:
   assumed_state: true
   emulated_hue_name: "Living Room AMP"
 
-switch.Outlet_Den: 
+switch.den_outlet: 
   friendly_name: 'Den Outlet'
   icon: mdi:power-plug
   assumed_state: true
@@ -37,7 +37,7 @@ switch.Printer_Outlet:
   icon: mdi:printer
   assumed_state: true  
   
-switch.Outlet_Living_Room: 
+switch.living_room_outlet: 
   friendly_name: 'Living Room Outlet'
   icon: mdi:power-plug
   assumed_state: true  
diff --git a/group/switches.yaml b/group/switches.yaml
index 5aad39c3..0586a990 100755
--- a/group/switches.yaml
+++ b/group/switches.yaml
@@ -1,7 +1,7 @@
 Switches:
   entities:
-    - switch.outlet_den
-    - switch.outlet_living_room
+    - switch.den_outlet
+    - switch.living_room_outlet
     - switch.foyer_outlet
     - switch.kitchen_Accents
     - switch.printer_outlet
diff --git a/script/Reliability.yaml b/script/Reliability.yaml
new file mode 100755
index 00000000..c26db784
--- /dev/null
+++ b/script/Reliability.yaml
@@ -0,0 +1,21 @@
+######################################################################################################
+###Script to run every 30 minutes to check if 433 RF Switches are in the state they should be.
+###  Sample Call
+#  action:
+#   - service: script.reliability
+######################################################################################################
+
+{% macro swTest(onoff='') %}
+    - service: switch.turn_{{ states(onoff) }}
+      entity_id: {{ onoff }}
+{% endmacro %}
+
+switch_check:
+  sequence:
+{{ swTest("switch.foyer_outlet") }}
+{{ swTest("switch.printer_outlet") }}
+{{ swTest("switch.garage_outlet") }}
+{{ swTest("switch.den_outlet") }}
+{{ swTest("switch.living_room_outlet") }}
+{{ swTest("switch.living_room_amp") }}
+    
\ No newline at end of file
diff --git a/script/switch_turn_off.yaml b/script/switch_turn_off.yaml
index e95d420b..7c820c16 100755
--- a/script/switch_turn_off.yaml
+++ b/script/switch_turn_off.yaml
@@ -8,13 +8,13 @@
 switch_turn_off_all:
   sequence:
     - service: switch.turn_off
-      entity_id: switch.outlet_living_room
+      entity_id: switch.living_room_outlet
     - delay: '00:01:00'
     - service: switch.turn_off
       entity_id: switch.kitchen_Accents
     - delay: '00:01:00'
     - service: switch.turn_off
-      entity_id: switch.outlet_den
+      entity_id: switch.den_outlet
     - delay: '00:01:00'
     - service: switch.turn_off
       entity_id: switch.foyer_outlet
@@ -29,13 +29,13 @@ switch_turn_off_all:
       entity_id: switch.living_room_amp
       
     - service: switch.turn_off
-      entity_id: switch.outlet_living_room
+      entity_id: switch.living_room_outlet
     - delay: '00:01:00'
     - service: switch.turn_off
       entity_id: switch.kitchen_Accents
     - delay: '00:01:00'
     - service: switch.turn_off
-      entity_id: switch.outlet_den
+      entity_id: switch.den_outlet
     - delay: '00:01:00'
     - service: switch.turn_off
       entity_id: switch.foyer_outlet