diff --git a/source/_integrations/onkyo.markdown b/source/_integrations/onkyo.markdown
index a62daeaae88..725208fab9a 100644
--- a/source/_integrations/onkyo.markdown
+++ b/source/_integrations/onkyo.markdown
@@ -38,7 +38,7 @@ name:
   required: false
   type: string
 max_volume:
-  description: Maximum volume as a percentage. Often the maximum volume of the receiver is far too loud. Setting this wil set Home Assistant's 100% volume to be this setting on the amp. i.e., if you set this to 50% when you set Home Assistant to be 100% then your receiver will be set to 50% of it's maximum volume.
+  description: Maximum volume as a percentage. Often the maximum volume of the receiver is far too loud. Setting this will set Home Assistant's 100% volume to be this setting on the amp. i.e., if you set this to 50% when you set Home Assistant to be 100% then your receiver will be set to 50% of it's maximum volume.
   required: false
   default: 100
   type: integer
diff --git a/source/_integrations/samsungtv.markdown b/source/_integrations/samsungtv.markdown
index eeb024a3024..7c54268104f 100644
--- a/source/_integrations/samsungtv.markdown
+++ b/source/_integrations/samsungtv.markdown
@@ -60,7 +60,7 @@ samsungtv:
     turn_on_action:
       - service: wake_on_lan.send_magic_packet
         data:
-          mac: "11:22:33:44:55:66"
+          mac: MAC_ADDRESS
 ```
 
 ### Usage
diff --git a/source/_integrations/tplink.markdown b/source/_integrations/tplink.markdown
index 76da4db8f96..941d4cf3732 100644
--- a/source/_integrations/tplink.markdown
+++ b/source/_integrations/tplink.markdown
@@ -150,24 +150,24 @@ sensor:
   - platform: template
     sensors:
       my_tp_switch_amps:
-        friendly_name_template: "{{ states.switch.my_tp_switch.name}} Current"
-        value_template: '{{ states.switch.my_tp_switch.attributes["current_a"] | float }}'
+        friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Current"
+        value_template: "{{ state_attr('switch.my_tp_switch','current_a') | float }}"
         unit_of_measurement: 'A'
       my_tp_switch_watts:
-        friendly_name_template: "{{ states.switch.my_tp_switch.name}} Current Consumption"
-        value_template: '{{ states.switch.my_tp_switch.attributes["current_power_w"] | float }}'
+        friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Current Consumption"
+        value_template: "{{ state_attr('switch.my_tp_switch','current_power_w') | float }}"
         unit_of_measurement: 'W'
       my_tp_switch_total_kwh:
-        friendly_name_template: "{{ states.switch.my_tp_switch.name}} Total Consumption"
-        value_template: '{{ states.switch.my_tp_switch.attributes["total_energy_kwh"] | float }}'
+        friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Total Consumption"
+        value_template: "{{ state_attr('switch.my_tp_switch','total_energy_kwh') | float }}"
         unit_of_measurement: 'kWh'
       my_tp_switch_volts:
-        friendly_name_template: "{{ states.switch.my_tp_switch.name}} Voltage"
-        value_template: '{{ states.switch.my_tp_switch.attributes["voltage"] | float }}'
+        friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Voltage"
+        value_template: "{{ state_attr('switch.my_tp_switch','voltage') | float }}"
         unit_of_measurement: 'V'
       my_tp_switch_today_kwh:
-        friendly_name_template: "{{ states.switch.my_tp_switch.name}} Today's Consumption"
-        value_template: '{{ states.switch.my_tp_switch.attributes["today_energy_kwh"] | float }}'
+        friendly_name_template: "{{ state_attr('switch.my_tp_switch','friendly_name') }} Today's Consumption"
+        value_template: "{{ state_attr('switch.my_tp_switch','today_energy_kwh') | float }}"
         unit_of_measurement: 'kWh'
 ```
 {% endraw %}