diff --git a/configuration.yaml b/configuration.yaml
index 50a5d61..9386b29 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -128,7 +128,8 @@ recorder:
     entities:
       - media_player.living_room_tv
       - media_player.basement_tv
-      - media_player.master_bedroom_firetv
+      - media_player.master_bedroom_chromecast
+      - media_player.master_bedroom_chromecast_remote
       - media_player.everywhere
       - media_player.basement_echo_dot
       - media_player.living_room_echo_dot
@@ -251,7 +252,8 @@ influxdb:
     entities:
       - media_player.living_room_tv
       - media_player.basement_tv
-      - media_player.master_bedroom_firetv
+      - media_player.master_bedroom_chromecast
+      - media_player.master_bedroom_chromecast_remote
       - sensor.doors_open
       - sensor.windows_open
       - sensor.total_faults
@@ -406,7 +408,8 @@ prometheus:
     include_entities:
       - media_player.living_room_tv
       - media_player.basement_tv
-      - media_player.master_bedroom_firetv
+      - media_player.master_bedroom_chromecast
+      - media_player.master_bedroom_chromecast_remote
       - sensor.doors_open
       - sensor.windows_open
       - sensor.total_faults
diff --git a/custom_sentences/en/media.yaml b/custom_sentences/en/media.yaml
index 8be096e..948d3a1 100644
--- a/custom_sentences/en/media.yaml
+++ b/custom_sentences/en/media.yaml
@@ -19,7 +19,7 @@ lists:
       - in: "basement tv"
         out: "media_player.basement_tv"
       - in: "master bedroom tv"
-        out: "media_player.master_bedroom_firetv"
+        out: "media_player.master_bedroom_chromecast"
   volume:
     range:
       from: 0
diff --git a/packages/history_stats.yaml b/packages/history_stats.yaml
index 85d7f58..dd64aa7 100644
--- a/packages/history_stats.yaml
+++ b/packages/history_stats.yaml
@@ -33,7 +33,7 @@ sensor:
     hours: 24
 - platform: history_stats
   name: Master Bedroom TV Time
-  entity_id: media_player.master_bedroom_firetv
+  entity_id: media_player.master_bedroom_chromecast
   state: 'playing'
   type: time
   end: '{{ now() }}'
diff --git a/packages/presence.yaml b/packages/presence.yaml
index 82fe4c6..ce1763c 100644
--- a/packages/presence.yaml
+++ b/packages/presence.yaml
@@ -217,7 +217,7 @@ template:
         {{ is_state('light.master_bedroom_lights','on') or 
             is_state('light.master_bedroom_closet','on') or 
             is_state('input_boolean.master_bedroom_sleeping','on') or
-            not is_state('media_player.master_bedroom_firetv','off') }}
+            states('media_player.master_bedroom_chromecast') not in ['off','unavailable','unknown'] }}
       delay_off: "00:00:15"
     - name: "Kallen Bedroom Occupied"
       unique_id: d3fdbaee-48bd-44df-820e-6cbfd3d24c11
diff --git a/sensors/entertainment.yaml b/sensors/entertainment.yaml
index 17498f4..a02f4b5 100644
--- a/sensors/entertainment.yaml
+++ b/sensors/entertainment.yaml
@@ -18,8 +18,8 @@
   - name: 'Master Bedroom TV Current App'
     unique_id: 4bf4bef3-fc81-4259-a75c-6693ceba0926
     state: >-
-      {% if is_state('media_player.master_bedroom_firetv','off') %}
+      {% if is_state('media_player.master_bedroom_chromecast','off') %}
         Off
       {% else %}
-        {{ state_attr('media_player.master_bedroom_firetv','app_name') }}
+        {{ state_attr('media_player.master_bedroom_chromecast','app_name') }}
       {% endif %}
\ No newline at end of file