diff --git a/source/_docs/configuration/templating.markdown b/source/_docs/configuration/templating.markdown
index c3bbe7874c1..f1722b57b8c 100644
--- a/source/_docs/configuration/templating.markdown
+++ b/source/_docs/configuration/templating.markdown
@@ -10,7 +10,7 @@ This is an advanced feature of Home Assistant. You'll need a basic understanding
 
 Templating is a powerful feature that allows you to control information going into and out of the system. It is used for:
 
-- Formatting outgoing messages in, for example, the [notify](/integrations/notify/) platforms and [Alexa](/integrations/alexa/) component.
+- Formatting outgoing messages in, for example, the [notify](/integrations/notify/) platforms and [Alexa](/integrations/alexa/) integration.
 - Process incoming data from sources that provide raw data, like [MQTT](/docs/configuration/templating/#using-templates-with-the-mqtt-integration), [`rest` sensor](/integrations/rest/) or the [`command_line` sensor](/integrations/sensor.command_line/).
 - [Automation Templating](/docs/automation/templating/).
 
diff --git a/source/_docs/configuration/troubleshooting.markdown b/source/_docs/configuration/troubleshooting.markdown
index 47b423abb3e..d391d374bf5 100644
--- a/source/_docs/configuration/troubleshooting.markdown
+++ b/source/_docs/configuration/troubleshooting.markdown
@@ -29,7 +29,7 @@ One of the most common problems with Home Assistant is an invalid `configuration
 - You can verify your configuration's YAML structure using [this online YAML parser](https://yaml-online-parser.appspot.com/) or [YAML Validator](https://codebeautify.org/yaml-validator/).
 - To learn more about the quirks of YAML, read [YAML IDIOSYNCRASIES](https://docs.saltproject.io/en/latest/topics/troubleshooting/yaml_idiosyncrasies.html) by SaltStack (the examples there are specific to SaltStack, but do explain YAML issues well).
 
-`configuration.yaml` does not allow multiple sections to have the same name. If you want to load multiple platforms for one component, you can append a number or string to the name or nest them:
+`configuration.yaml` does not allow multiple sections to have the same name. If you want to load multiple platforms for one integration, you can append a number or string to the name or nest them:
 
 ```yaml
 sensor:
@@ -39,7 +39,7 @@ sensor:
     ...
 ```
 
-Another common problem is that a required configuration setting is missing. If this is the case, the integration will report this to `home-assistant.log`. You can have a look at [the various integration pages](/integrations/) for instructions on how to setup the components.
+Another common problem is that a required configuration setting is missing. If this is the case, the integration will report this to `home-assistant.log`. You can have a look at [the various integration pages](/integrations/) for instructions on how to setup the integrations.
 
 See the [logger](/integrations/logger/) integration for instructions on how to define the level of logging you require for specific modules.
 
diff --git a/source/_includes/common-tasks/configuration_check.md b/source/_includes/common-tasks/configuration_check.md
index 4f39fdce11e..cc68d407518 100644
--- a/source/_includes/common-tasks/configuration_check.md
+++ b/source/_includes/common-tasks/configuration_check.md
@@ -22,13 +22,13 @@ Listing all loaded files:
 docker exec homeassistant python -m homeassistant --script check_config --files
 ```
 
-Viewing a component’s configuration ([`light`](/integrations/light) in this example):
+Viewing an integration’s configuration ([`light`](/integrations/light) in this example):
 
 ```bash
 docker exec homeassistant python -m homeassistant --script check_config --info light
 ```
 
-Or all components’ configuration
+Or all integrations’ configuration
 
 ```bash
 docker exec homeassistant python -m homeassistant --script check_config --info all
@@ -68,13 +68,13 @@ docker exec homeassistant python -m homeassistant --script check_config --help
     hass --script check_config --files
     ```
 
-    Viewing a component’s configuration ([`light`](/integrations/light) in this example):
+    Viewing a integration’s configuration ([`light`](/integrations/light) in this example):
 
     ```bash
     hass --script check_config --info light
     ```
 
-    Or all components’ configuration
+    Or all integrations’ configuration
 
     ```bash
     hass --script check_config --info all
diff --git a/source/_integrations/alarmdecoder.markdown b/source/_integrations/alarmdecoder.markdown
index 09f4f5af901..8f0b97ecb77 100644
--- a/source/_integrations/alarmdecoder.markdown
+++ b/source/_integrations/alarmdecoder.markdown
@@ -26,7 +26,7 @@ There is currently support for the following device types within Home Assistant:
 - Sensor: Emulates a keypad display
 - Binary Sensor: Reports on zone status
 
-This is a fully event-based component. Any event sent by the AlarmDecoder device will be immediately reflected within Home Assistant.
+This is a fully event-based integration. Any event sent by the AlarmDecoder device will be immediately reflected within Home Assistant.
 
 {% include integrations/config_flow.md %}
 
diff --git a/source/_integrations/alert.markdown b/source/_integrations/alert.markdown
index 9077891255c..203d7c4b7a2 100644
--- a/source/_integrations/alert.markdown
+++ b/source/_integrations/alert.markdown
@@ -125,7 +125,7 @@ you specify a `target` parameter when sending the notification), you can use the
 `group` notification to wrap them for an alert.
 Simply create a `group` notification type with a single notification member
 (such as `twilio_sms`) specifying the required parameters other than `message`
-provided by the `alert` component:
+provided by the `alert` integration:
 
 ```yaml
 - platform: group