diff --git a/source/_docs/configuration/customizing-devices.markdown b/source/_docs/configuration/customizing-devices.markdown
index de23e8c3416..3d361720b40 100644
--- a/source/_docs/configuration/customizing-devices.markdown
+++ b/source/_docs/configuration/customizing-devices.markdown
@@ -7,15 +7,27 @@ related:
     title: Home Assistant Core integration documentation
 ---
 
-## Changing the entity ID
+## Changing entity name and entity ID
 
-You can use the UI to change the entity ID and friendly name of supported entities. To do this:
+After adding a new device, the entity may not have a name and the automatically assigned entity ID might look very technical. If you like, you can use your own naming concept for devices.
 
-1. Select the {% term entity %}, either from the frontend or by selecting the info button next to the entity in the Developer Tools "States" tab.
-2. Select the cog icon in the right corner of the entity's dialog
-![Entity dialog box.](/images/docs/configuration/customizing-entity-dialog.png)
-3. Enter the new name or the new entity ID (remember not to change the domain of the entity - the part before the `.`)
-![Settings for entity.](/images/docs/configuration/customizing-entity.png)
-4. Select *Update*
+To change the entity ID and friendly name of supported entities, follow these steps:
 
-If your entity is not supported, or you cannot customize what you need via this method, you need to edit the settings in your [`configuration.yaml` file](/docs/configuration/).For a detailed description of the entity configuration variables, refer to the [Home Assistant Core integration documentation](/integrations/homeassistant/).
+1. Go to {% my entities title="**Settings** > **Devices & services** > **Entities**" %} and select the entity from the list.
+2. In the top right corner, select the cog icon.
+
+   ![Entity dialog box with cog icon.](/images/docs/configuration/customizing-entity-dialog.png)
+
+3. Enter the new name or the new entity ID.
+   - For example, the entity ID here could be `light.bedroom_ligthstrip`.
+   - Do not change the domain of the entity - the part before the `.`.
+
+   ![Settings for entity.](/images/docs/configuration/customizing-entity.png)
+
+4. Select **Update**.
+5. If you have used this entity in automations and scripts, you need to rename the entity ID there, too.
+   - Go to {% my automations title="**Settings** > **Automations & Scenes**" %} open the respective tab and find your automation or script.
+
+   ![Edit entity ID in automation.](/images/docs/configuration/edit_entity-id_in_automation.png)
+
+If your entity is not supported, or you cannot customize what you need via this method, you need to edit the settings in your [`configuration.yaml` file](/docs/configuration/). For a detailed description of the entity configuration variables, refer to the [Home Assistant Core integration documentation](/integrations/homeassistant/).
diff --git a/source/images/docs/configuration/customizing-entity-dialog.png b/source/images/docs/configuration/customizing-entity-dialog.png
index 0526735d7c8..5dda10ee232 100644
Binary files a/source/images/docs/configuration/customizing-entity-dialog.png and b/source/images/docs/configuration/customizing-entity-dialog.png differ
diff --git a/source/images/docs/configuration/customizing-entity.png b/source/images/docs/configuration/customizing-entity.png
index 85244081353..e1ccaa269cc 100644
Binary files a/source/images/docs/configuration/customizing-entity.png and b/source/images/docs/configuration/customizing-entity.png differ
diff --git a/source/images/docs/configuration/edit_entity-id_in_automation.png b/source/images/docs/configuration/edit_entity-id_in_automation.png
new file mode 100644
index 00000000000..1b20b856cf9
Binary files /dev/null and b/source/images/docs/configuration/edit_entity-id_in_automation.png differ