Change Integrations to Devices & Services (#20620)

source/_integrations/aemet.markdown

@@ -27,7 +27,7 @@ The AEMET OpenData service is completely free but is limited to the Spanish terr
 
 ## Configuration
 
-To add AEMET OpenData integration go to **Configuration** >> **Integrations** and find the integration in the list.
+To add AEMET OpenData integration go to **Configuration** >> **Devices & Services** and find the integration in the list.
 
 {% configuration_basic %}
 API Key:

source/_integrations/asuswrt.markdown

@@ -28,7 +28,7 @@ There is currently support for the following device types within Home Assistant:
 
 To add your ASUSWRT devices into your Home Assistant installation, go to:
 
-**Configuration** -> **Integrations** in the UI, click the button with `+` sign and from the list of integrations select **ASUSWRT**.
+**Configuration** -> **Devices & Services** in the UI, click the button with `+` sign and from the list of integrations select **ASUSWRT**.
 
 <div class='note warning'>
 

source/_integrations/bmw_connected_drive.markdown

@@ -44,14 +44,14 @@ This integration provides the following platforms:
 
 ## Configuration
 
-The preferred way to enable the `bmw_connected_drive` integration is via **Configuration** > **Integrations**. After connecting to your account, you can set the following settings in the integration's options:
+The preferred way to enable the `bmw_connected_drive` integration is via **Configuration** > **Devices & Services**. After connecting to your account, you can set the following settings in the integration's options:
 
 | Setting | Description |
 |---------|-------------|
 | Read-only | No execution of services to the vehicle. Still possible to send messages and POIs via `notify` and to request a status update via `bmw_connected_drive.update_state`.
 | Use Home Assistant location for car location polls | Older cars (non i3/i8 build before 7/2014) require the phone to be close to the car to get location updates. Enable this option to use the location of your Home Assistant instance for these queries, so updates are available when your car is in the surrounding of your home. |
 
-The following settings in your `configuration.yaml` file are considered legacy. They will be imported into **Configuration** > **Integrations** and you can set the options from above. Changes to `configuration.yaml` after the first import will be ignored.
+The following settings in your `configuration.yaml` file are considered legacy. They will be imported into **Configuration** > **Devices & Services** and you can set the options from above. Changes to `configuration.yaml` after the first import will be ignored.
 
 ### Legacy configuration
 

source/_integrations/control4.markdown

@@ -23,7 +23,7 @@ Before setting up, you should assign a static IP address/DHCP reservation on you
 
 ## Options
 
-The Control4 integration offers additional options in **Configuration** -> **Integrations** -> **Control4** -> **Options**:
+The Control4 integration offers additional options in **Configuration** -> **Devices & Services** -> **Control4** -> **Options**:
 
 {% configuration %}
 Seconds between updates:

source/_integrations/dexcom.markdown

@@ -31,7 +31,7 @@ There are two Dexcom Share servers, `US` for United States customers, and `OUS`
 
 ### Unit of measurement
 
-The integrations allows both `mg/dL` and `mmol/l` units of measurement for blood glucose values. To change your preferred unit of measurement, got to **Configuration** >> **Integrations** in the UI, and click `OPTIONS`.
+The integrations allows both `mg/dL` and `mmol/l` units of measurement for blood glucose values. To change your preferred unit of measurement, got to **Configuration** >> **Devices & Services** in the UI, and click `OPTIONS`.
 
 ## Sensor
 

source/_integrations/dlna_dmr.markdown

@@ -23,7 +23,7 @@ Please note that some devices, such as Samsung TVs, are rather picky about the s
 
 ## Options
 
-Options for DLNA DMR devices can be set going to **Configuration** -> **Integrations** -> **DLNA Digital Media Renderer** -> **Configuration**.
+Options for DLNA DMR devices can be set going to **Configuration** -> **Devices & Services** -> **DLNA Digital Media Renderer** -> **Configuration**.
 
 {% configuration_basic %}
 Event listener port:

source/_integrations/dsmr.markdown

@@ -36,7 +36,7 @@ A sensor platform for Belgian, Dutch, Luxembourg and Swedish Smart Meters which
 
 ### Options
 
-To configure options for DSMR integration go to **Configuration** >> **Integrations** and press **Options** on the DSMR card.
+To configure options for DSMR integration go to **Configuration** >> **Devices & Services** and press **Options** on the DSMR card.
 
 #### Time between updates
 

source/_integrations/eafm.md

@@ -21,7 +21,7 @@ The UK Environment Agency Flood Monitoring only provides data for England - Nort
 
 ## Configuration
 
-Home Assistant offers the flood monitoring integration through **Configuration** -> **Integrations** -> **Environment Agency Flood Gauges**.
+Home Assistant offers the flood monitoring integration through **Configuration** -> **Devices & Services** -> **Environment Agency Flood Gauges**.
 
 You will be prompted to select a monitoring station. You can find the name of nearby monitoring stations on the Flood information service [website](https://flood-warning-information.service.gov.uk/river-and-sea-levels).
 

source/_integrations/ecobee.markdown

@@ -50,14 +50,14 @@ Your new application will now appear on the left. Upon clicking on the applicati
 
 ## Configuration
 
-1. In the **Configuration** > **Integrations** menu, click **+** and then select "ecobee" from the pop-up menu.
+1. In the **Configuration** > **Devices & Services** menu, click **+** and then select "ecobee" from the pop-up menu.
 2. In the pop-up box, enter the API key you obtained from ecobee's [developer portal](https://ecobee.com/developers).
 3. In the next pop-up box, you will be presented with a unique four-character PIN code which you will need to authorize in the [ecobee consumer portal](https://www.ecobee.com/consumerportal/index.html). You can do this by logging in, selecting **My Apps** from the hamburger menu, clicking **Add Application** on the left, entering the PIN code from Home Assistant, clicking **Validate** and then **Add Application** in the bottom right.
 4. After authorizing the app with ecobee, return to Home Assistant and click **Submit**. If the authorization was successful, a configuration entry will be created and your thermostats and sensors will be available in Home Assistant.
 
 ## Manual Configuration
 
-If you prefer to set up the integration in [`configuration.yaml`](/docs/configuration/), add your API key (and optional parameters) as follows (however, you must still complete authorization via the **Integrations** menu):
+If you prefer to set up the integration in [`configuration.yaml`](/docs/configuration/), add your API key (and optional parameters) as follows (however, you must still complete authorization via the **Integrations** panel):
 
 ```yaml
 # Example configuration.yaml entry
@@ -67,7 +67,7 @@ ecobee:
 
 {% configuration %}
 api_key:
-  description: Your ecobee API key. This is only needed for the initial setup of the integration. Once registered it can be removed. If you revoke the key in the ecobee portal, you will need to remove the existing `ecobee` configuration in the **Integrations** menu, update this, and then configure the integration again.
+  description: Your ecobee API key. This is only needed for the initial setup of the integration. Once registered it can be removed. If you revoke the key in the ecobee portal, you will need to remove the existing `ecobee` configuration in the **Integrations** panel, update this, and then configure the integration again.
   required: false
   type: string
 {% endconfiguration %}
@@ -77,7 +77,7 @@ api_key:
   <img src='/images/screenshots/ecobee-thermostat-card.png' />
 </p>
 
-You must [restart Home Assistant](/docs/configuration/#reloading-changes) for the changes to take effect. After restarting, navigate to the **Configuration** > **Integrations** menu, hit **Configure** next to the discovered `ecobee` entry, and continue to authorize the app according to the above **Automatic Configuration**, starting at step 2.
+You must [restart Home Assistant](/docs/configuration/#reloading-changes) for the changes to take effect. After restarting, navigate to the **Configuration** > **Devices & Services** menu, hit **Configure** next to the discovered `ecobee` entry, and continue to authorize the app according to the above **Automatic Configuration**, starting at step 2.
 
 ## Notifications
 

source/_integrations/flume.markdown

@@ -25,7 +25,7 @@ You can find your Client ID and Client Secret under "API Access" on the [setting
 
 The Flume API access is available to Flume Insight users only, which may require a paid subscription.
 
-To add `Flume` to your installation, go to **Configuration** >> **Integrations** in the UI, click the button with `+` sign and from the list of integrations select **Flume**.
+To add `Flume` to your installation, go to **Configuration** >> **Devices & Services** in the UI, click the button with `+` sign and from the list of integrations select **Flume**.
 
 ## Configuration for Binary Sensor
 

source/_integrations/freebox.markdown

@@ -36,7 +36,7 @@ Please consult the [API documentation](https://dev.freebox.fr/sdk/os/) for more
 
 ### Via the frontend
 
-Menu: **Configuration** -> **Integrations**. Search for "Freebox", add your host and port, click submit.
+Menu: **Configuration** -> **Devices & Services**. Search for "Freebox", add your host and port, click submit.
 
 If you add the integration for the first time, follow the instructions in the [Initial setup](#initial-setup) section.
 

source/_integrations/harmony.markdown

@@ -32,7 +32,7 @@ Supported units:
 
 {% include integrations/config_flow.md %}
 
-Once the Logitech Harmony Hub has been configured, the default activity and duration in seconds between sending commands to a device can be adjusted in the settings via **Configuration** >> **Integrations** >> **Your Logitech Harmony Hub**
+Once the Logitech Harmony Hub has been configured, the default activity and duration in seconds between sending commands to a device can be adjusted in the settings via **Configuration** >> **Devices & Services** >> **Your Logitech Harmony Hub**
 
 ### Configuration file
 

source/_integrations/homekit.markdown

@@ -306,7 +306,7 @@ The HomeKit Accessory Protocol Specification only allows a maximum of 150 unique
 
 ### Multiple HomeKit instances
 
-If you create a HomeKit integration via the UI (i.e., **Configuration** >> **Integrations**), it must be configured via the UI **only**. While the UI only offers limited configuration options at the moment, any attempt to configure a HomeKit instance created in the UI via the `configuration.yaml` file will result in another instance of HomeKit running on a different port.
+If you create a HomeKit integration via the UI (i.e., **Configuration** >> **Devices & Services**), it must be configured via the UI **only**. While the UI only offers limited configuration options at the moment, any attempt to configure a HomeKit instance created in the UI via the `configuration.yaml` file will result in another instance of HomeKit running on a different port.
 
 It is recommended to only edit a HomeKit instance in the UI that was created in the UI, and likewise, only edit a HomeKit instance in YAML that was created in YAML.
 
@@ -479,15 +479,15 @@ The following home hubs have been reported to have trouble with a large number o
 
 ### Resetting when created via YAML
 
- 1. Delete the `HomeKit` integration in the **{% my integrations %}** screen.
+ 1. Delete the `HomeKit` integration in the **{% my integrations %}** panel.
  2. **Restart** Home Assistant.
  3. The configuration will be automatically reimported from YAML.
  4. [Pair the bridge or accessory](#setup).
 
-### Resetting when created via the **Integrations** screen
+### Resetting when created via the **Integrations** panel
 
- 1. Delete the `HomeKit` integration in the **Integrations** screen.
- 2. Recreate the `HomeKit` integration in the **Integrations** screen.
+ 1. Delete the `HomeKit` integration in the **Integrations** panel.
+ 2. Recreate the `HomeKit` integration in the **Integrations** panel.
  3. [Pair the bridge or accessory](#setup).
 
 ### Errors during pairing
@@ -600,7 +600,7 @@ Ensure that the [`ffmpeg`](/integrations/ffmpeg) integration is configured corre
 
 #### Camera streaming is unstable or slow 
 
-If your camera supports native H.264 streams, Home Assistant can avoid converting the video stream, which is an expensive operation. To enable native H.264 streaming when configured via YAML, change the `video_codec` to `copy`. To allow native H.264 streaming when setting up HomeKit via the UI, go to **Configuration** >> **Integrations** in the UI, click **Options** for your HomeKit Bridge, and check the box for your camera on the `Cameras that support native H.264 streams` screen.
+If your camera supports native H.264 streams, Home Assistant can avoid converting the video stream, which is an expensive operation. To enable native H.264 streaming when configured via YAML, change the `video_codec` to `copy`. To allow native H.264 streaming when setting up HomeKit via the UI, go to **Configuration** >> **Devices & Services** in the UI, click **Options** for your HomeKit Bridge, and check the box for your camera on the `Cameras that support native H.264 streams` screen.
 
 #### Multiple camera streams
 

source/_integrations/huawei_lte.markdown

@@ -68,7 +68,7 @@ entities varies by device model and firmware version.
 
 ### Configuration via the frontend
 
-Menu: **Configuration** -> **Integrations**.
+Menu: **Configuration** -> **Devices & Services**.
 
 Click on the `+` sign to add an integration and click on **Huawei
 LTE**, and follow the configuration flow. After finishing, the Huawei

source/_integrations/keenetic_ndms2.markdown

@@ -20,4 +20,4 @@ Router running NDMS firmware versions 2.05 and up. It uses telnet connection so
 
 ## Configuration
 
-To add Keenetic router to your installation, go to **Configuration** >> **Integrations** in the UI, click the button with `+` sign and from the list of integrations select **Keenetic NDMS2 Router**.
+To add Keenetic router to your installation, go to **Configuration** >> **Devices & Services** in the UI, click the button with `+` sign and from the list of integrations select **Keenetic NDMS2 Router**.

source/_integrations/konnected.markdown

@@ -48,7 +48,7 @@ Konnected devices communicate with Home Assistant over your local LAN -- there i
 
 ### Web Interface
 
-Starting with 0.106.0 Home Assistant requires UI based configuration of Konnected via **Configuration** -> **Integrations** in the Home Assistant (web) frontend. If you have Konnected Alarm Panels on your LAN, or in your configuration.yaml, you will see one or more **Konnected.io** entries appear in the **Discovered** integrations list.
+Starting with 0.106.0 Home Assistant requires UI based configuration of Konnected via **Configuration** -> **Devices & Services** in the Home Assistant (web) frontend. If you have Konnected Alarm Panels on your LAN, or in your configuration.yaml, you will see one or more **Konnected.io** entries appear in the **Discovered** integrations list.
 
 Selecting one of these discovered panels will guide you through connecting and configuring the panel. If your panel was discovered via SSDP, you shouldn't need any information to complete configuration - simply confirm that the information displayed is correct. If the UI prompts you for IP/Port, you'll need to enter it. IP/Port info can be found using the Konnected mobile app.
 
@@ -56,15 +56,15 @@ Selecting one of these discovered panels will guide you through connecting and c
 
 If you have an existing `configuration.yaml` completing the UI configuration will do a one time import of the settings contained in `configuration.yaml`. Once the import creates a **Configured** integration the Konnected section of the `configuration.yaml` is no longer used - it is recommended to remove the `konnected` section of `configuration.yaml` and after the import occurs. Any future changes to settings should occur via the settings provided in the Home Assistant web interface.
 
-If you want to retain `configuration.yaml` and need to re-import any changes or updates you will need to delete the entry in **Configuration** -> **Integrations** -> **Configured** and repeat the UI configuration for that device.
+If you want to retain `configuration.yaml` and need to re-import any changes or updates you will need to delete the entry in **Configuration** -> **Devices & Services** -> **Configured** and repeat the UI configuration for that device.
 
 </div>  
 
-Once configuration is completed you'll see a Konnected.io entry in **Configuration** -> **Integrations** => **Configured**.  If you imported settings from `configuration.yaml` you are now done! If you are setting up a new Konnected Alarm Panel or modifying settings, you'll need to utilize the settings UI to configure zone behavior.
+Once configuration is completed you'll see a Konnected.io entry in **Configuration** -> **Devices & Services** => **Configured**.  If you imported settings from `configuration.yaml` you are now done! If you are setting up a new Konnected Alarm Panel or modifying settings, you'll need to utilize the settings UI to configure zone behavior.
 
 #### Using Settings UI to Configure Zone Behavior
 
-The settings for each panel can be accessed by selecting the entry in **Configuration** -> **Integrations** => **Configured** and then clicking on the gear icon in the upper right corner. You can reconfigure these settings at any time and once completed the settings will be immediately applied.
+The settings for each panel can be accessed by selecting the entry in **Configuration** -> **Devices & Services** => **Configured** and then clicking on the gear icon in the upper right corner. You can reconfigure these settings at any time and once completed the settings will be immediately applied.
 
 The settings UI starts by having you configure the general behavior of each zone. You need to specify `Disabled`, `Binary Sensor`, `Digital Sensor`, or `Switchable Output` for each zone.  After that, you'll be prompted, for each zone that is not disabled, to configure details of the zones' behavior. All zones will allow entry of a Name. Additional fields depend on how you configured the general behavior of the zone.  
 **Note some zones do not support all behaviors. The UI will reflect specific options available to each zone.**

source/_integrations/meteo_france.markdown

@@ -33,7 +33,7 @@ It displays the current weather along with a 5 days forecast and create sensors,
 
 To be used with the weather Lovelace card to access current condition, today and next four days forecast.
 
-The weather platform can be configured in the frontend to decide if the forecast is given daily (default) or hourly. To change the setting go in **Configuration** -> **Integrations**, click on the city name in **Météo-France** box and click on **Options**. You can update the `Forecast mode` by choosing between `daily` or `hourly`.
+The weather platform can be configured in the frontend to decide if the forecast is given daily (default) or hourly. To change the setting go in **Configuration** -> **Devices & Services**, click on the city name in **Météo-France** box and click on **Options**. You can update the `Forecast mode` by choosing between `daily` or `hourly`.
 
 ## Sensor platforms
 
@@ -58,7 +58,7 @@ All the following sensors will be created :
 
 Warning: The probability entities data are not always provided by the API. They are added only if available.
 
-To enable an entity disabled by default, go in **Configuration** -> **Integrations**, click on the city name in **Météo-France** and then the **X entities** link. You will have the list of the enabled entities. Here click the filter button and select **Show disable entities**. The disabled entities will be visible in the list, select the one you want to enable and click the **Enable Selected** button.
+To enable an entity disabled by default, go in **Configuration** -> **Devices & Services**, click on the city name in **Météo-France** and then the **X entities** link. You will have the list of the enabled entities. Here click the filter button and select **Show disable entities**. The disabled entities will be visible in the list, select the one you want to enable and click the **Enable Selected** button.
 
 ### About `next_rain` condition sensor
 

source/_integrations/mysensors.markdown

@@ -25,7 +25,7 @@ The [MySensors](https://www.mysensors.org) project combines devices like Arduino
 
 ## Configuration
 
-To integrate your Serial, Ethernet (LAN) or MQTT MySensors Gateway, go to **Configuration** >> **Integrations** in the UI, click the button with `+` sign and from the list of integration select **MySensors**.
+To integrate your Serial, Ethernet (LAN) or MQTT MySensors Gateway, go to **Configuration** >> **Devices & Services** in the UI, click the button with `+` sign and from the list of integration select **MySensors**.
 
 Configuration depends on the type of Gateway you use:
 

source/_integrations/nest.markdown

@@ -297,7 +297,7 @@ In this section you will authorize Home Assistant to access your account by gene
 
 - Restart the Thermostat device. See [How to restart or reset a Nest thermostat](https://support.google.com/googlenest/answer/9247296) for more details.
 - In the official Nest app or on https://home.nest.com: Move the Thermostat to a different or fake/temporary room.
-- Reload the integration in Home Assistant:  Navigate to **Configuration** then **Integrations**, click `...` next to *Nest* and choose **Reload**.
+- Reload the integration in Home Assistant:  Navigate to **Configuration** then **Devices & Services**, click `...` next to *Nest* and choose **Reload**.
 
 {% enddetails %}
 

source/_integrations/netatmo.markdown

@@ -235,7 +235,7 @@ client_secret:
 
 **After the client_id and client_secret is added to your `configuration.yaml` you must enable Netatmo through the integrations page.**
 
-Menu: **Configuration** -> **Integrations**.
+Menu: **Configuration** -> **Devices & Services**.
 
 Click on the `+` sign to add an integration and click on **Netatmo**.
 After completing the configuration flow, the Netatmo integration will be available.

source/_integrations/plex.markdown

@@ -338,5 +338,5 @@ play_plex_on_tv:
 
 ## Notes
 
-- The Plex integration supports multiple Plex servers. Additional connections can be configured under **Configuration** > **Integrations**.
+- The Plex integration supports multiple Plex servers. Additional connections can be configured under **Configuration** > **Devices & Services**.
 - Movies must be located under the 'Movies' section in a Plex library to properly view the 'playing' state.

source/_integrations/rfxtrx.markdown

@@ -62,7 +62,7 @@ You can host your device on another computer by setting up ser2net and example c
 
 ## Settings options
 
-To configure options for RFXtrx integration go to **Configuration** >> **Integrations** and press **Options** on the RFXtrx card.
+To configure options for RFXtrx integration go to **Configuration** >> **Devices & Services** and press **Options** on the RFXtrx card.
 
 <img src='/images/integrations/rfxtrx/options.png' />
 

source/_integrations/ruckus_unleashed.markdown

@@ -21,7 +21,7 @@ There is currently support for the following device types within Home Assistant:
 
 ## Configuration
 
-To add a Ruckus Unleashed device to your installation, go to **Configuration** -> **Integrations**, click the `+` button, then select **Ruckus** from the list of integrations.
+To add a Ruckus Unleashed device to your installation, go to **Configuration** -> **Devices & Services**, click the `+` button, then select **Ruckus** from the list of integrations.
 
 It is required to configure the IP address of your **master access point**. See the section Access Points on the management web interface. And perhaps consider to set a preferred master (Admin & Services>System>System Info>Preferred master).
 

source/_integrations/screenlogic.markdown

@@ -28,7 +28,7 @@ The Pentair ScreenLogic integration allows you to integrate your Pentair Intelli
 
 ## Options
 
-ScreenLogic options are set via **Configuration** -> **Integrations** -> **Pentair ScreenLogic** -> **Options**.
+ScreenLogic options are set via **Configuration** -> **Devices & Services** -> **Pentair ScreenLogic** -> **Options**.
 
 * Seconds between scans - How many seconds between each polling of the ScreenLogic gateway.
 

source/_integrations/sentry.markdown

@@ -45,6 +45,6 @@ The Sentry integration provides settings to:
 - Ability to send out events originating from third-party Python packages.
 - Enable performance tracing and tune the tracing sample rate used.
 
-To change the settings go in **Configuration** -> **Integrations**, find the already installed **Sentry** box and click on **Options**.
+To change the settings go in **Configuration** -> **Devices & Services**, find the already installed **Sentry** box and click on **Options**.
 
 After changing Sentry settings, you'll need to restart Home Assistant in order to make them effective.

source/_integrations/somfy_mylink.markdown

@@ -17,4 +17,4 @@ The `Somfy MyLink` integration is used as an interface to a compatible Somfy MyL
 
 {% include integrations/config_flow.md %}
 
-If any of your devices are reversed, they can be adjusted in **Configuration** >> **Integrations** >> **Somfy MyLink** >> `Options`.
+If any of your devices are reversed, they can be adjusted in **Configuration** >> **Devices & Services** >> **Somfy MyLink** >> `Options`.

source/_integrations/subaru.markdown

@@ -54,7 +54,7 @@ If your account includes multiple vehicles, the same PIN will be used for all ve
 
 Subaru integration options are set via:
 
-**Configuration** -> **Integrations** -> **Subaru** -> **Options**.
+**Configuration** -> **Devices & Services** -> **Subaru** -> **Options**.
 
 The only option is:
 

source/_integrations/xiaomi_aqara.markdown

@@ -65,7 +65,7 @@ Please note, there are two versions of the hub: v1 and v2. v1 can be used with H
 
 Follow the setup process using your phone and Mi-Home app. From here you will be able to retrieve the key (password) from within the app following [this tutorial](https://www.domoticz.com/wiki/Xiaomi_Gateway_(Aqara)#Adding_the_Xiaomi_Gateway_to_Domoticz).
 
-To enable {{ page.title }} in your installation, go to **Configuration** in the sidebar, then click **Integrations**. Xiaomi Aqara gateways should be discovered automatically and should show up in the overview. Hit configure and go through the steps to specify the optional settings. If your aqara gateway does not show up automatically, click the + icon in the lower right. Then search for "xiaomi_aqara" and enter the setup. Multiple gateways can be configured by simply repeating the setup multiple times.
+To enable {{ page.title }} in your installation, go to **Configuration** in the sidebar, then click **Devices & Services**. Xiaomi Aqara gateways should be discovered automatically and should show up in the overview. Hit configure and go through the steps to specify the optional settings. If your aqara gateway does not show up automatically, click the + icon in the lower right. Then search for "xiaomi_aqara" and enter the setup. Multiple gateways can be configured by simply repeating the setup multiple times.
 
 {% configuration %}
 interface:

source/_integrations/zha.markdown

@@ -338,7 +338,7 @@ This service disables a lock code on a Zigbee lock.
 
 To add a new device:
 
-1. Go to the **Integrations** page, find the **Zigbee Home Automation** integration that was added by the configuration steps above, and select **Configure**.
+1. Go to the **Integrations** panel, find the **Zigbee Home Automation** integration that was added by the configuration steps above, and select **Configure**.
 1. Click on the plus button at the bottom right corner to start a scan for new devices.
 1. Reset your Zigbee devices according to the device instructions provided by the manufacturer (e.g., turn on/off lights up to 10 times, switches usually have a reset button/pin). It might take a few seconds for the devices to appear. You can click on **Show logs** for more verbose output.
 1. Once the device is found, it will appear on that page and will be automatically added to your devices. You can optionally change its name and add it to an area (you can change this later). You can search again to add another device, or you can go back to the list of added devices.
@@ -405,7 +405,7 @@ When reporting issues, please provide the following information in addition to i
 1. Debug logs for the issue, see [debug logging](#debug-logging)
 2. Model of Zigbee radio being used
 3. If issue is related to a specific Zigbee device, provide device Zigbee signature. Signature is available at
-**Configuration** -> **Integrations** -> **Zigbee Home Automation** (click **Configure**) -> **Devices** (pick your device) -> **Zigbee Device Signature**
+**Configuration** -> **Devices & Services** -> **Zigbee Home Automation** (click **Configure**) -> **Devices** (pick your device) -> **Zigbee Device Signature**
 
 ### Debug logging
 

source/_integrations/zwave.markdown

@@ -674,7 +674,7 @@ You can use the **Remove Failed Node** button to remove a failed device (e.g., b
 
 ## Control panel
 
-The Z-Wave control panel is available via **Configuration** → **Integrations** → **Z-Wave** → **Configure**.
+The Z-Wave control panel is available via **Configuration** → **Devices & Services** → **Z-Wave** → **Configure**.
 
 - **No Z-Wave integration?** Follow the [set up instructions](/integrations/zwave/#detailed-installation-instructions) to enable it.
 - **Missing the *Configuration* button?** See the [configuration documentation](/integrations/config/) for instructions on enabling it.

source/_integrations/zwave_js.markdown

@@ -724,7 +724,7 @@ to pick up those new names, either reload the integration or restart Home Assist
 
 When trying to determine why something isn't working as you expect, or when reporting an issue with the integration, it is helpful to know what Z-Wave JS sees as the current state of your Z-Wave network. To get a dump of your current network state, follow the menu:
 
-**Configuration** -> **Integrations** -> **Z-Wave JS** -> **Configure** -> **Download a dump of your network to help diagnose issues**
+**Configuration** -> **Devices & Services** -> **Z-Wave JS** -> **Configure** -> **Download a dump of your network to help diagnose issues**
 
 ### Interference issues