diff --git a/.github/settings.yml b/.github/settings.yml
index 2f78ef9..55735cc 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,8 +1,8 @@
 ---
 repository:
-  description: "Traccar - Community Hass.io Add-on for Home Assistant"
+  description: "Traccar - Home Assistant Community Add-ons"
   homepage: https://addons.community
-  topics: traccar, gps, tracking, hassio-addons, hassio, hass, home-assistant, homeassistant
+  topics: traccar, gps, tracking, addon, addons, home-assistant, homeassistant
   private: false
   has_issues: true
   has_projects: false
diff --git a/README.md b/README.md
index 41d2bad..da455c3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -44,9 +44,10 @@ your Home Assistant instance as well.
 ## 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 "Traccar" add-on in the Hass.io add-on store and install it.
+1. Search for the "Traccar" add-on in the Supervisor add-on store
+   and install it.
 1. Start the "Traccar" add-on
 1. Check the logs of the "Traccar" add-on to see if everything went well.
 1. Click the "OPEN WEB UI" button and log in using `admin`/`admin`.
@@ -96,13 +97,13 @@ Set it `true` to enable it, `false` otherwise.
 
 The certificate file to use for SSL.
 
-**Note**: _The file MUST be stored in `/ssl/`, which is the 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 the default for Hass.io_
+**Note**: _The file MUST be stored in `/ssl/`, which is the default_
 
 ## Storing data in MySQL/MariaDB
 
@@ -170,7 +171,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.
@@ -196,11 +197,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/traccar/.README.j2 b/traccar/.README.j2
index f194aa7..7b4d8d0 100644
--- a/traccar/.README.j2
+++ b/traccar/.README.j2
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -33,8 +33,8 @@ your Home Assistant instance as well.
 {% 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.
@@ -54,7 +54,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/traccar/Dockerfile b/traccar/Dockerfile
index 3970df6..a23b92a 100755
--- a/traccar/Dockerfile
+++ b/traccar/Dockerfile
@@ -48,4 +48,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-traccar/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-traccar" \
-    org.label-schema.vendor="Community Hass.io Add-ons"
+    org.label-schema.vendor="Home Assistant Community Add-ons"
diff --git a/traccar/config.json b/traccar/config.json
index c4177e8..6fe8d46 100755
--- a/traccar/config.json
+++ b/traccar/config.json
@@ -24,7 +24,7 @@
     "80/tcp": null
   },
   "ports_description": {
-    "80/tcp": "Web interface (Not required for Hass.io Ingress)"
+    "80/tcp": "Web interface (Not required for Ingress)"
   },
   "map": [
     "config:rw",
diff --git a/traccar/rootfs/etc/cont-init.d/nginx.sh b/traccar/rootfs/etc/cont-init.d/nginx.sh
index 99a0708..124f187 100644
--- a/traccar/rootfs/etc/cont-init.d/nginx.sh
+++ b/traccar/rootfs/etc/cont-init.d/nginx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 # Configures NGINX for use with the Traccar server
 # ==============================================================================
 declare port
diff --git a/traccar/rootfs/etc/cont-init.d/traccar.sh b/traccar/rootfs/etc/cont-init.d/traccar.sh
index ab509f2..3e75ef6 100644
--- a/traccar/rootfs/etc/cont-init.d/traccar.sh
+++ b/traccar/rootfs/etc/cont-init.d/traccar.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 # Ensures the user configuration file is present
 # ==============================================================================
 if ! bashio::fs.file_exists "/config/traccar.xml"; then
diff --git a/traccar/rootfs/etc/nginx/nginx.conf b/traccar/rootfs/etc/nginx/nginx.conf
index 9e9a49c..dd2801e 100644
--- a/traccar/rootfs/etc/nginx/nginx.conf
+++ b/traccar/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/traccar/rootfs/etc/services.d/nginx/finish b/traccar/rootfs/etc/services.d/nginx/finish
index d7057cc..18ece6c 100644
--- a/traccar/rootfs/etc/services.d/nginx/finish
+++ b/traccar/rootfs/etc/services.d/nginx/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 # Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/traccar/rootfs/etc/services.d/nginx/run b/traccar/rootfs/etc/services.d/nginx/run
index 344e894..1188654 100644
--- a/traccar/rootfs/etc/services.d/nginx/run
+++ b/traccar/rootfs/etc/services.d/nginx/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 # Runs the Nginx daemon
 # ==============================================================================
 bashio::net.wait_for 18682 localhost 900
diff --git a/traccar/rootfs/etc/services.d/traccar/finish b/traccar/rootfs/etc/services.d/traccar/finish
index 5465a56..1c3bd93 100644
--- a/traccar/rootfs/etc/services.d/traccar/finish
+++ b/traccar/rootfs/etc/services.d/traccar/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 # Take down the S6 supervision tree when the Traccar daemon fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/traccar/rootfs/etc/services.d/traccar/run b/traccar/rootfs/etc/services.d/traccar/run
index 87e2330..060a482 100644
--- a/traccar/rootfs/etc/services.d/traccar/run
+++ b/traccar/rootfs/etc/services.d/traccar/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Traccar
+# Home Assistant Community Add-on: Traccar
 # Runs the Traccar daemon
 # ==============================================================================
 declare -a options