diff --git a/include/text_sensors.yaml b/include/text_sensors.yaml
index 3dea323068eee26842b03a4eed91819cd26457e1..a67a7ec44037bba1ab1b5327ef766c7c4dc75780 100644
--- a/include/text_sensors.yaml
+++ b/include/text_sensors.yaml
@@ -1,6 +1,6 @@
 - platform: wifi_info
   ip_address:
-    name: "IP Address"
+    name: "Wifi IP Address"
   ssid:
     name: "Wifi SSID"
   bssid:
diff --git a/propbox.yaml b/propbox.yaml
index e79dfba80f2591519715f33f7d4fb58c9136a06b..a0c92b56dc238587f576873bea2997141bda887c 100644
--- a/propbox.yaml
+++ b/propbox.yaml
@@ -44,6 +44,15 @@ http_request:
   useragent: esphome/${devicename}
   timeout: 10s
 
+globals:
+  - id: schedule
+    type: int
+    restore_value: true
+    initial_value: '0'
+
+text_sensor:
+  !include include/text_sensors.yaml
+
 sensor:
 ### Default Sensors
 
@@ -52,7 +61,7 @@ sensor:
     update_interval: 60s
 
   - platform: uptime
-    name: "Uptime"
+    name: "Device Uptime"
     update_interval: 60s
 
 ### Specific Sensors
@@ -85,15 +94,6 @@ sensor:
     name: "Water Temperature"
     accuracy_decimals: 2
 
-text_sensor:
-  !include include/text_sensors.yaml
-
-globals:
-  - id: schedule
-    type: int
-    restore_value: true
-    initial_value: '0'
-
 select:
   - platform: template
     id: select_schedule
@@ -112,7 +112,7 @@ select:
 
 switch:
   - platform: restart
-    name: "Restart"
+    name: "Device Restart"
   - platform: template
     id: propbox_light
     name: "Light Status"