diff --git a/source/_integrations/ubus.markdown b/source/_integrations/ubus.markdown
index f2cec962300..01240032804 100644
--- a/source/_integrations/ubus.markdown
+++ b/source/_integrations/ubus.markdown
@@ -13,7 +13,7 @@ ha_integration_type: integration
 
 This is a presence detection scanner for [OpenWrt](https://openwrt.org/) using [ubus](https://wiki.openwrt.org/doc/techref/ubus). It scans for changes in `hostapd.*`, which will detect and report changes in devices connected to the access point on the router.
 
-Before this scanner can be used you have to install the ubus RPC packages on OpenWrt (versions older than 18.06.x do not require the `uhttpd-mod-ubus` package):
+Before this scanner can be used, you have to install the ubus RPC packages on OpenWrt (versions older than 18.06.x do not require the `uhttpd-mod-ubus` package):
 
 ```bash
 opkg update
@@ -90,7 +90,7 @@ If you find that this never creates `known_devices.yaml`, or if you need more in
 ### Increase Log Level
 
 1. On your Home Assistant device, stop Home Assistant
-2. Adjust `configuration.yaml` to log more detail for the `device_tracker` component
+2. Adjust `configuration.yaml` to log more detail for the `device_tracker` integration.
 
     ```yaml
     logger:
diff --git a/source/_integrations/vacuum.markdown b/source/_integrations/vacuum.markdown
index a493e3625fd..de3155326c8 100644
--- a/source/_integrations/vacuum.markdown
+++ b/source/_integrations/vacuum.markdown
@@ -24,7 +24,7 @@ vacuum:
     host: 192.168.1.2
 ```
 
-### Component services
+### Integration services
 
 Available services: `turn_on`, `turn_off`, `start_pause`, `start`, `pause`, `stop`, `return_to_base`, `locate`, `clean_spot`, `set_fan_speed` and `send_command`.
 
diff --git a/source/_integrations/vacuum.template.markdown b/source/_integrations/vacuum.template.markdown
index 4b032cf5b63..1f186efc3c9 100644
--- a/source/_integrations/vacuum.template.markdown
+++ b/source/_integrations/vacuum.template.markdown
@@ -111,7 +111,7 @@ State-based template entities have the special template variable `this` availabl
 
 ### Control vacuum with Harmony Hub
 
-This example shows how you can use a Template Vacuum to control an IR vacuum cleaner using the [Harmony Hub Remote component](/integrations/harmony).
+This example shows how you can use a Template Vacuum to control an IR vacuum cleaner using the [Harmony Hub Remote integration](/integrations/harmony).
 
 ```yaml
 vacuum:
diff --git a/source/_integrations/vicare.markdown b/source/_integrations/vicare.markdown
index 54ad909e4fa..0934f9b2aac 100644
--- a/source/_integrations/vicare.markdown
+++ b/source/_integrations/vicare.markdown
@@ -61,7 +61,7 @@ A note about the current temperature attribute: Viessmann devices with room temp
 
 ### Supported services `climate.vicare_heating`
 
-The following services of the [Climate component](/integrations/climate/) are provided by the ViCare integration: `set_temperature`, `set_hvac_mode`, `set_preset_mode` 
+The following services of the [Climate integration](/integrations/climate/) are provided by the ViCare integration: `set_temperature`, `set_hvac_mode`, `set_preset_mode` 
 
 #### Service `set_temperature`
 
@@ -78,7 +78,7 @@ Note that `set_temperature` will always affect the current normal temperature or
 
 Set HVAC mode for the climate device. The following modes are supported:
 
-The `climate.vicare_heating` component has the following mapping of HVAC modes to Viessmann operation modes:
+The `climate.vicare_heating` integration has the following mapping of HVAC modes to Viessmann operation modes:
 
 | HVAC mode | Viessmann mode | Description |
 | ---------------------- | -------- | ----------- |
@@ -112,11 +112,11 @@ Eco mode reduces the target temperature by 3°C, whereas Comfort mode sets the t
 
 ## Water Heater
 
-It is not possible to turn on/off water heating via the Water Heater component since this would conflict with the operation modes of the heating component. Therefore the operation mode of that component is just available as an attribute and cannot be modified.
+It is not possible to turn on/off water heating via the Water Heater integration since this would conflict with the operation modes of the heating integration. Therefore the operation mode of that integration is just available as an attribute and cannot be modified.
 
 ### Supported services `water_heater.vicare_water`
 
-The following services of the [Water Heater component](/integrations/water_heater/) are provided by the ViCare integration: `set_temperature`
+The following services of the [Water Heater integration](/integrations/water_heater/) are provided by the ViCare integration: `set_temperature`
 
 #### Service `set_temperature`