diff --git a/.github/settings.yml b/.github/settings.yml
index 8d631dd..8ebd632 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,8 +1,8 @@
 ---
 repository:
-  description: "Glances - Community Hass.io Add-on for Home Assistant"
+  description: "Glances - Community Home Assistant Add-ons"
   homepage: https://addons.community
-  topics: glances, monitoring, system, hassio-addons, hassio, hass, home-assistant, homeassistant
+  topics: glances, monitoring, system, addon, addons, home-assistant, homeassistant
   private: false
   has_issues: true
   has_projects: false
diff --git a/README.md b/README.md
index 63361a2..074467d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -36,9 +36,10 @@ at all your system information and its behavior over time.
 ## 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. Search for the "Glances" add-on in the Hass.io add-on store and install it.
+1. Search for the "Glances" add-on in the Supervisor add-on store
+   and install it.
 1. Disable "Protection mode" in the add-on panel.
 1. Start the "Glances" add-on.
 1. Check the logs of the "Glances" to see if everything went well.
@@ -111,13 +112,13 @@ Enables/Disables SSL (HTTPS) on the Glances Web UI. Set it `true` to enable it,
 
 The certificate file to use for SSL.
 
-**Note**: _The file MUST be stored in `/ssl/`, which is default for Hass.io_
+**Note**: _The file MUST be stored in `/ssl/`, which is the default_
 
 ### Option: `keyfile`
 
 The private key file to use for SSL.
 
-**Note**: _The file MUST be stored in `/ssl/`, which is default for Hass.io_
+**Note**: _The file MUST be stored in `/ssl/`, which is the default_
 
 ### Option group `influxdb`
 
@@ -223,7 +224,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 [Community Home Assistant 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.
@@ -249,11 +250,11 @@ The original setup of this repository is by [Franck Nijhof][frenck].
 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/glances/.README.j2 b/glances/.README.j2
index 926866e..062f9f5 100644
--- a/glances/.README.j2
+++ b/glances/.README.j2
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -25,8 +25,8 @@ at all your system information and its behavior over time.
 {% if channel == "edge" %}
 ## WARNING! THIS IS AN EDGE VERSION!
 
-This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
-add-ons are based upon the latest development version.
+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.
 - They might stop working at any time.
@@ -46,7 +46,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/glances/Dockerfile b/glances/Dockerfile
index 4114a15..b203696 100755
--- a/glances/Dockerfile
+++ b/glances/Dockerfile
@@ -62,4 +62,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-glances/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-glances" \
-    org.label-schema.vendor="Community Hass.io Add-ons"
+    org.label-schema.vendor="Community Home Assistant Add-ons"
diff --git a/glances/rootfs/bin/s6-nuke b/glances/rootfs/bin/s6-nuke
index 466dde1..82ef0b2 100755
--- a/glances/rootfs/bin/s6-nuke
+++ b/glances/rootfs/bin/s6-nuke
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # This file turns s6-nuke into a NOOP to prevent total termination
 # of the host system since the add-on runs in the same PID namespace.
 # ==============================================================================
diff --git a/glances/rootfs/etc/cont-init.d/glances.sh b/glances/rootfs/etc/cont-init.d/glances.sh
index 1a1298e..902ab2c 100644
--- a/glances/rootfs/etc/cont-init.d/glances.sh
+++ b/glances/rootfs/etc/cont-init.d/glances.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # Configures Glances
 # ==============================================================================
 declare protocol
diff --git a/glances/rootfs/etc/cont-init.d/nginx.sh b/glances/rootfs/etc/cont-init.d/nginx.sh
index 126cdf7..a91adb1 100644
--- a/glances/rootfs/etc/cont-init.d/nginx.sh
+++ b/glances/rootfs/etc/cont-init.d/nginx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: SSH & Web Terminal
+# Community Home Assistant Add-on: SSH & Web Terminal
 # Configures NGINX for use with ttyd
 # ==============================================================================
 declare port
diff --git a/glances/rootfs/etc/nginx/lua/ha-auth.lua b/glances/rootfs/etc/nginx/lua/ha-auth.lua
index 998b509..7aa9d3e 100644
--- a/glances/rootfs/etc/nginx/lua/ha-auth.lua
+++ b/glances/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://supervisor.local.hass.io/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/glances/rootfs/etc/nginx/nginx.conf b/glances/rootfs/etc/nginx/nginx.conf
index 715f022..a944c84 100644
--- a/glances/rootfs/etc/nginx/nginx.conf
+++ b/glances/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 /dev/stdout error;
 
 # Load allowed environment vars
diff --git a/glances/rootfs/etc/services.d/glances/finish b/glances/rootfs/etc/services.d/glances/finish
index caf50f2..4e7b4fa 100644
--- a/glances/rootfs/etc/services.d/glances/finish
+++ b/glances/rootfs/etc/services.d/glances/finish
@@ -1,10 +1,9 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # Take down the S6 supervision tree when Glances 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
diff --git a/glances/rootfs/etc/services.d/glances/run b/glances/rootfs/etc/services.d/glances/run
index c6906d3..6a6adce 100644
--- a/glances/rootfs/etc/services.d/glances/run
+++ b/glances/rootfs/etc/services.d/glances/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # Runs Glances
 # ==============================================================================
 declare -a options
diff --git a/glances/rootfs/etc/services.d/influxdb/finish b/glances/rootfs/etc/services.d/influxdb/finish
index 8e8f0aa..4e7b4fa 100644
--- a/glances/rootfs/etc/services.d/influxdb/finish
+++ b/glances/rootfs/etc/services.d/influxdb/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # Take down the S6 supervision tree when Glances fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/glances/rootfs/etc/services.d/influxdb/run b/glances/rootfs/etc/services.d/influxdb/run
index 35b3ec6..d79775e 100644
--- a/glances/rootfs/etc/services.d/influxdb/run
+++ b/glances/rootfs/etc/services.d/influxdb/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # Runs Glances InfluxDB Export
 # ==============================================================================
 declare -a options
diff --git a/glances/rootfs/etc/services.d/nginx/finish b/glances/rootfs/etc/services.d/nginx/finish
index ecf8783..029ef52 100644
--- a/glances/rootfs/etc/services.d/nginx/finish
+++ b/glances/rootfs/etc/services.d/nginx/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # Take down the S6 supervision tree when the nginx daemon fails
 # ==============================================================================
 # Disabled to allow for some testing
diff --git a/glances/rootfs/etc/services.d/nginx/run b/glances/rootfs/etc/services.d/nginx/run
index 4304b88..76ef107 100644
--- a/glances/rootfs/etc/services.d/nginx/run
+++ b/glances/rootfs/etc/services.d/nginx/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Glances
+# Community Home Assistant Add-on: Glances
 # Runs the nginx daemon
 # ==============================================================================