diff --git a/source/_integrations/shiftr.markdown b/source/_integrations/shiftr.markdown
index 2f93ceccc8c..d80698f67c6 100644
--- a/source/_integrations/shiftr.markdown
+++ b/source/_integrations/shiftr.markdown
@@ -13,7 +13,7 @@ The `shiftr` integration makes it possible to transfer details collected with Ho
 
 ## Configuration
 
-Create a new [namespace](https://shiftr.io/new) and generate a new token. You will need to use `Key (Username)` and `Secret (Password)` to setup the component.
+Create a new [namespace](https://shiftr.io/new) and generate a new token. You will need to use `Key (Username)` and `Secret (Password)` to setup the integration.
 
 To use the `shiftr` integration in your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_integrations/stiebel_eltron.markdown b/source/_integrations/stiebel_eltron.markdown
index 31fdfa890da..566f8f9c85c 100644
--- a/source/_integrations/stiebel_eltron.markdown
+++ b/source/_integrations/stiebel_eltron.markdown
@@ -48,7 +48,7 @@ The following preset modes are supported. The STIEBEL ELTRON modes are mapped an
 
 ## Configuration
 
-To enable this component, add the following lines to your `configuration.yaml` file:
+To enable this integration, add the following lines to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
diff --git a/source/_integrations/stream.markdown b/source/_integrations/stream.markdown
index 179ad0d18cf..7130b2cb7bc 100644
--- a/source/_integrations/stream.markdown
+++ b/source/_integrations/stream.markdown
@@ -16,7 +16,7 @@ ha_platforms:
 ha_integration_type: system
 ---
 
-The stream integration provides a way to proxy live streams through Home Assistant. Most users should not need to configure anything or interface with the component directly since it is an internal component used by the [camera integration](/integrations/camera).
+The stream integration provides a way to proxy live streams through Home Assistant. Most users should not need to configure anything or interface with the integration directly since it is an internal integration used by the [camera integration](/integrations/camera).
 
 ## Configuration
 
diff --git a/source/_integrations/surepetcare.markdown b/source/_integrations/surepetcare.markdown
index d89110fd529..7b25d8f5f85 100644
--- a/source/_integrations/surepetcare.markdown
+++ b/source/_integrations/surepetcare.markdown
@@ -19,7 +19,7 @@ ha_platforms:
 ha_integration_type: integration
 ---
 
-The `surepetcare` component allows you to get information on your Sure Petcare Connect Pet or Cat Flap.
+The Sure Petcare integration allows you to get information on your Sure Petcare Connect Pet or Cat Flap.
 
 {% include integrations/config_flow.md %}
 
diff --git a/source/_integrations/system_log.markdown b/source/_integrations/system_log.markdown
index 558c64c85ac..c14ddca5756 100644
--- a/source/_integrations/system_log.markdown
+++ b/source/_integrations/system_log.markdown
@@ -59,7 +59,7 @@ Errors and warnings are posted as the event `system_log_event`, so it is possibl
 | `source`    | File that triggered the error, e.g., `core.py` or `media_player/yamaha.py`. |
 | `exception` | Full stack trace if available, an empty string otherwise.                   |
 | `message`   | Descriptive message of the error, e.g., "Error handling request".           |
-| `name`      | Name of the component, e.g., `homeassistant.components.device_tracker`      |
+| `name`      | Name of the integration, e.g., `homeassistant.components.device_tracker`      |
 | `timestamp` | Unix timestamp with as a double, e.g., 1517241010.237416.                   |
 
 Live examples of these events can be found in the Home Assistant log file (`home-assistant.log`) or by just looking in the system log. An example could, for instance, look like this: