diff --git a/.github/settings.yml b/.github/settings.yml
index d94d24e..bf71e0f 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,8 +1,8 @@
 ---
 repository:
-  description: "Mopidy - Community Hass.io Add-on for Home Assistant"
+  description: "Mopidy - Home Assistant Community Add-ons"
   homepage: https://addons.community
-  topics: music-player, mopidy, python, hassio-addons, hassio, hass, home-assistant, homeassistant
+  topics: music-player, mopidy, addon, addons, home-assistant, homeassistant
   private: false
   has_issues: true
   has_projects: false
diff --git a/README.md b/README.md
index 9d02ad3..02f0284 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -28,7 +28,7 @@ range of MPD and web clients.
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in
-comparison to installing any other Hass.io add-on.
+comparison to installing any other Home Assistant add-on.
 
 1. [Add our Hass.io add-ons repository][repository] to your Hass.io instance.
 1. Install the "Mopidy" add-on.
@@ -159,7 +159,7 @@ Got questions?
 
 You have several options to get them answered:
 
-- The [Community Hass.io Add-ons Discord chat server][discord] for add-on
+- The [Home Assistant Community Add-ons Discord chat server][discord] for add-on
   support and feature requests.
 - The [Home Assistant Discord chat server][discord-ha] for general Home
   Assistant discussions and questions.
@@ -186,11 +186,11 @@ The original setup of this repository is by [Bram Mittendorff][brammittendorff],
 For a full list of all authors and contributors,
 check [the contributor's page][contributors].
 
-## We have got some Hass.io add-ons for you
+## We have got some Home Assistant add-ons for you
 
-Want some more functionality to your Hass.io Home Assistant instance?
+Want some more functionality to your Home Assistant instance?
 
-We have created multiple add-ons for Hass.io. For a full list, check out
+We have created multiple add-ons for Home Assistant. For a full list, check out
 our [GitHub Repository][repository].
 
 ## License
diff --git a/mopidy/.README.j2 b/mopidy/.README.j2
index 6b5b7d2..d211580 100644
--- a/mopidy/.README.j2
+++ b/mopidy/.README.j2
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -23,7 +23,7 @@ range of MPD and web clients.
 {% if channel == "edge" %}
 ## WARNING! THIS IS AN EDGE VERSION!
 
-This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
+This Home Assistant Add-ons repository contains edge builds of add-ons. Edge builds
 add-ons are based upon the latest development version.
 
 - They may not work at all.
@@ -44,7 +44,7 @@ If you are more interested in stable releases of our add-ons:
 {% if channel == "beta" %}
 ## WARNING! THIS IS A BETA VERSION!
 
-This Hass.io Add-ons repository contains beta releases of add-ons.
+This Home Assistant Add-ons repository contains beta releases of add-ons.
 
 - They might stop working at any time.
 - They could have a negative impact on your system.
diff --git a/mopidy/Dockerfile b/mopidy/Dockerfile
index ed41c72..21e8fc0 100755
--- a/mopidy/Dockerfile
+++ b/mopidy/Dockerfile
@@ -103,4 +103,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-mopidy/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-mopidy" \
-    org.label-schema.vendor="Community Hass.io Add-ons"
+    org.label-schema.vendor="Home Assistant Community Add-ons"
diff --git a/mopidy/config.json b/mopidy/config.json
index a3b255e..86fe545 100755
--- a/mopidy/config.json
+++ b/mopidy/config.json
@@ -28,7 +28,7 @@
   "ports_description": {
     "6600/tcp": "Mopidy",
     "5555/udp": "Autoaudiosink",
-    "80/tcp": "Web interface (Not required for Hass.io Ingress)"
+    "80/tcp": "Web interface (Not required for Ingress)"
   },
   "map": [
     "config",
diff --git a/mopidy/rootfs/etc/cont-init.d/11-nginx.sh b/mopidy/rootfs/etc/cont-init.d/11-nginx.sh
index c08b0b1..5e3af3d 100644
--- a/mopidy/rootfs/etc/cont-init.d/11-nginx.sh
+++ b/mopidy/rootfs/etc/cont-init.d/11-nginx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: InfluxDB
+# Home Assistant Community Add-on: InfluxDB
 # Configures NGINX for use with the Chronograf
 # ==============================================================================
 declare port
@@ -34,4 +34,4 @@ ingress_port=$(bashio::addon.ingress_port)
 ingress_interface=$(bashio::addon.ip_address)
 sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
 sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
-sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/nginx/servers/ingress.conf
\ No newline at end of file
+sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/nginx/servers/ingress.conf
diff --git a/mopidy/rootfs/etc/cont-init.d/20-folders.sh b/mopidy/rootfs/etc/cont-init.d/20-folders.sh
index c2a5f1f..dfa7944 100644
--- a/mopidy/rootfs/etc/cont-init.d/20-folders.sh
+++ b/mopidy/rootfs/etc/cont-init.d/20-folders.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 # Ensures needed folder exists.
 # ==============================================================================
 readonly MEDIA_DIR="/share/mopidy/media"
diff --git a/mopidy/rootfs/etc/cont-init.d/80-system-packages.sh b/mopidy/rootfs/etc/cont-init.d/80-system-packages.sh
index 75811a6..af3dda5 100644
--- a/mopidy/rootfs/etc/cont-init.d/80-system-packages.sh
+++ b/mopidy/rootfs/etc/cont-init.d/80-system-packages.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 # Install user configured/requested packages
 # ==============================================================================
 if bashio::config.has_value 'system_packages'; then
diff --git a/mopidy/rootfs/etc/cont-init.d/81-python-packages.sh b/mopidy/rootfs/etc/cont-init.d/81-python-packages.sh
index 3dea38b..cc64c23 100644
--- a/mopidy/rootfs/etc/cont-init.d/81-python-packages.sh
+++ b/mopidy/rootfs/etc/cont-init.d/81-python-packages.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 # Install user configured/requested Python packages
 # ==============================================================================
 if bashio::config.has_value 'python_packages'; then
diff --git a/mopidy/rootfs/etc/nginx/ha-auth.lua b/mopidy/rootfs/etc/nginx/ha-auth.lua
index 0f6eaec..4e066b8 100644
--- a/mopidy/rootfs/etc/nginx/ha-auth.lua
+++ b/mopidy/rootfs/etc/nginx/ha-auth.lua
@@ -29,7 +29,7 @@ function authenticate()
         return true
     end
 
-    --- HTTP request against Hassio API
+    --- HTTP request against the Supervisor API
     local httpc = http.new()
     local res, err = httpc:request_uri("http://hassio/auth", {
         method = "POST",
@@ -44,13 +44,13 @@ function authenticate()
 
     --- Error during API request
     if err then
-        ngx.log(ngx.WARN, "Error during Hassio user authentication.", err)
+        ngx.log(ngx.WARN, "Error during Home Assistant user authentication.", err)
         return false
     end
 
     --- No result? Something went wrong...
     if not res then
-        ngx.log(ngx.WARN, "Error during Hassio user authentication.")
+        ngx.log(ngx.WARN, "Error during Home Assistant user authentication.")
         return false
     end
 
diff --git a/mopidy/rootfs/etc/nginx/lua/ha-auth.lua b/mopidy/rootfs/etc/nginx/lua/ha-auth.lua
index 9aa1385..b3542a2 100644
--- a/mopidy/rootfs/etc/nginx/lua/ha-auth.lua
+++ b/mopidy/rootfs/etc/nginx/lua/ha-auth.lua
@@ -29,7 +29,7 @@ function authenticate()
         return true
     end
 
-    --- HTTP request against Hassio API
+    --- HTTP request against the Supervisor API
     local httpc = http.new()
     local res, err = httpc:request_uri("http://hassio/auth", {
         method = "POST",
@@ -44,13 +44,13 @@ function authenticate()
 
     --- Error during API request
     if err then
-        ngx.log(ngx.WARN, "Error during Hassio user authentication.", err)
+        ngx.log(ngx.WARN, "Error during Home Assistant user authentication.", err)
         return false
     end
 
     --- No result? Something went wrong...
     if not res then
-        ngx.log(ngx.WARN, "Error during Hassio user authentication.")
+        ngx.log(ngx.WARN, "Error during Home Assistant user authentication.")
         return false
     end
 
diff --git a/mopidy/rootfs/etc/nginx/nginx.conf b/mopidy/rootfs/etc/nginx/nginx.conf
index 0b7a81e..5d5980a 100644
--- a/mopidy/rootfs/etc/nginx/nginx.conf
+++ b/mopidy/rootfs/etc/nginx/nginx.conf
@@ -13,7 +13,7 @@ worker_processes 1;
 # Enables the use of JIT for regular expressions to speed-up their processing.
 pcre_jit on;
 
-# Write error log to Hass.io add-on log.
+# Write error log to the add-on log.
 error_log /proc/1/fd/1 error;
 
 # Load allowed environment vars
diff --git a/mopidy/rootfs/etc/services.d/mopidy/finish b/mopidy/rootfs/etc/services.d/mopidy/finish
index 41e6a79..2da28c9 100644
--- a/mopidy/rootfs/etc/services.d/mopidy/finish
+++ b/mopidy/rootfs/etc/services.d/mopidy/finish
@@ -1,9 +1,9 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 # Take down the S6 supervision tree when Mopidy fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
 if -n { s6-test ${1} -eq 256 }
 
-s6-svscanctl -t /var/run/s6/services
\ No newline at end of file
+s6-svscanctl -t /var/run/s6/services
diff --git a/mopidy/rootfs/etc/services.d/mopidy/run b/mopidy/rootfs/etc/services.d/mopidy/run
index 3951607..973b728 100644
--- a/mopidy/rootfs/etc/services.d/mopidy/run
+++ b/mopidy/rootfs/etc/services.d/mopidy/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 # Runs the Mopidy
 # ==============================================================================
 declare -a options
diff --git a/mopidy/rootfs/etc/services.d/nginx/finish b/mopidy/rootfs/etc/services.d/nginx/finish
index 5e6ae83..15f7bc2 100644
--- a/mopidy/rootfs/etc/services.d/nginx/finish
+++ b/mopidy/rootfs/etc/services.d/nginx/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 # Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/mopidy/rootfs/etc/services.d/nginx/run b/mopidy/rootfs/etc/services.d/nginx/run
index 455c19b..8faca0c 100644
--- a/mopidy/rootfs/etc/services.d/nginx/run
+++ b/mopidy/rootfs/etc/services.d/nginx/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Mopidy
+# Home Assistant Community Add-on: Mopidy
 # Runs the Nginx daemon
 # ==============================================================================
 declare -a options