More consistent naming for briefings

input_boolean.yaml

@@ -1,5 +1,5 @@
-good_morning_report:
+good_morning:
-  name: Good Morning Report
+  name: Good Morning
   icon: mdi:home-analytics
 weather_reports:
   name: Weather Info

packages/announcements.yaml

@@ -3,18 +3,18 @@
 ###############################
 
 input_datetime:
-  morning_report:
+  morning_briefing:
-    name: Morning Report
+    name: Morning Briefing
     has_date: false
     has_time: true
     icon: mdi:home-analytics
-  nightly_report:
+  nightly_briefing:
-    name: Nightly Report
+    name: Nightly Briefing
     has_date: false
     has_time: true
     icon: mdi:home-analytics
-  daily_report:
+  daily_briefing:
-    name: Daily Report
+    name: Daily Briefing
     has_date: false
     has_time: true
     icon: mdi:home-analytics
@@ -130,13 +130,13 @@ automation:
     alias: House Briefings
     trigger:
     - platform: time
-      at: input_datetime.morning_report
+      at: input_datetime.morning_briefing
       id: house-morning
     - platform: time
-      at: input_datetime.daily_report
+      at: input_datetime.daily_briefing
       id: house-daily
     - platform: time
-      at: input_datetime.nightly_report
+      at: input_datetime.nightly_briefing
       id: house-nightly
     action:
     - choose:
@@ -144,7 +144,7 @@ automation:
         - condition: trigger
           id: house-morning
         sequence:
-        - service: script.morning_report
+        - service: script.morning_briefing
       - conditions:
         - condition: trigger
           id: house-daily
@@ -213,10 +213,10 @@ script:
   reset_annc_switches:
     sequence:
       - service: input_boolean.turn_off
-        entity_id: input_boolean.good_morning_report
+        entity_id: input_boolean.good_morning
 
-  morning_briefing:
+  morning_briefing_alexa:
-    alias: 'Morning Briefing'
+    alias: 'Morning Briefing Alexa'
     sequence:
       - service: button.press
         target:
@@ -278,8 +278,8 @@ script:
           who: common
           message: !include ../templates/speech/nightly_briefing.yaml
 
-  morning_report:
+  morning_briefing:
-    alias: 'Morning Report'
+    alias: 'Morning Briefing'
     sequence:
     - service: script.speech_engine
       data:

packages/scheduling.yaml

@@ -275,7 +275,7 @@ script:
               09:00
             {% endif %}
       - service: input_datetime.set_datetime
-        entity_id: input_datetime.morning_report
+        entity_id: input_datetime.morning_briefing
         data_template:
           time: >
             {% if is_state('input_boolean.kallen_school_today','on') %}
@@ -296,7 +296,7 @@ script:
               12:00
             {% endif %}
       - service: input_datetime.set_datetime
-        entity_id: input_datetime.daily_report
+        entity_id: input_datetime.daily_briefing
         data_template:
           time: >
             {% if is_state('input_boolean.kallen_school_today','on') %}
@@ -351,7 +351,7 @@ script:
     alias: 'House Scheduling Evening'
     sequence:
       - service: input_datetime.set_datetime
-        entity_id: input_datetime.nightly_report
+        entity_id: input_datetime.nightly_briefing
         data:
           time: >
             {{ (state_attr('input_datetime.kallen_bedtime','timestamp') - 3600) | timestamp_custom('%H:%M', false) }}

templates/speech/kallen_morning_briefing.yaml

@@ -1,5 +1,5 @@
 >
-  {# Kallen Morning Report #}
+  {# Kallen Morning Briefing #}
   {%- macro getReport() -%}
     <p>
       Good morning, Collin.

templates/speech/kallen_nightly_briefing.yaml

@@ -1,5 +1,5 @@
 >
-  {# Kallen Nightly Report #}
+  {# Kallen Nightly Briefing #}
   {%- macro getReport() -%}
     <p>
       Good Evening, Collin, 

templates/speech/morning_briefing.yaml

@@ -1,5 +1,5 @@
 >
-  {# Morning Report #}
+  {# Morning Briefing #}
   {%- macro getReport() -%}
     <p>
       {% if now().strftime('%H')|int < 12 and now().strftime('%H')|int > 6 %}