diff --git a/.github/settings.yml b/.github/settings.yml
index 3a9a7df..c710aeb 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,8 +1,8 @@
 ---
 repository:
-  description: "WireGuard - Community Hass.io Add-on for Home Assistant"
+  description: "WireGuard - Home Assistant Community Add-ons"
   homepage: https://addons.community
-  topics: wireguard, vpn, networking, hassio-addons, hassio, hass, home-assistant, homeassistant
+  topics: wireguard, vpn, networking, addon, addons, home-assistant, homeassistant
   private: false
   has_issues: true
   has_projects: false
diff --git a/README.md b/README.md
index af26af1..06d31cd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: WireGuard
+# Home Assistant Community Add-on: WireGuard
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -49,7 +49,8 @@ for you (if you want).
 
 Follow the following steps for installation & a quick start:
 
-1. Search for the "WireGuard" add-on in the Hass.io add-on store and install it.
+1. Search for the "WireGuard" add-on in the Supervisor add-on store
+   and install it.
 1. Set the `host` configuration option to your Hass.io (external) address,
    e.g., `myautomatedhome.duckdns.org`.
 1. Change the name of the peer to something useful, e.g., `myphone`.
@@ -513,7 +514,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.
@@ -539,11 +540,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/wireguard/.README.j2 b/wireguard/.README.j2
index 8888526..6678e61 100644
--- a/wireguard/.README.j2
+++ b/wireguard/.README.j2
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: WireGuard
+# Home Assistant Community Add-on: WireGuard
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -33,8 +33,8 @@ in the industry.
 {% 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/wireguard/Dockerfile b/wireguard/Dockerfile
index 547f3c4..69a76b2 100755
--- a/wireguard/Dockerfile
+++ b/wireguard/Dockerfile
@@ -55,4 +55,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-wireguard/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-wireguard" \
-    org.label-schema.vendor="Community Hass.io Add-ons"
+    org.label-schema.vendor="Home Assistant Community Add-ons"
diff --git a/wireguard/rootfs/etc/cont-init.d/config.sh b/wireguard/rootfs/etc/cont-init.d/config.sh
index 1c98b75..bdd5e23 100644
--- a/wireguard/rootfs/etc/cont-init.d/config.sh
+++ b/wireguard/rootfs/etc/cont-init.d/config.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: WireGuard
+# Home Assistant Community Add-on: WireGuard
 # Creates the interface configuration
 # ==============================================================================
 declare -a list
@@ -176,7 +176,7 @@ fi
 for peer in $(bashio::config 'peers|keys'); do
 
     name=$(bashio::config "peers[${peer}].name")
-    
+
     # Check if at least 1 address is specified
     if ! bashio::config.has_value "peers[${peer}].addresses"; then
         bashio::exit.nok "You need at least 1 address configured for ${name}"
diff --git a/wireguard/rootfs/etc/services.d/api/run b/wireguard/rootfs/etc/services.d/api/run
index dc139e8..6ee89f4 100644
--- a/wireguard/rootfs/etc/services.d/api/run
+++ b/wireguard/rootfs/etc/services.d/api/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: WireGuard
+# Home Assistant Community Add-on: WireGuard
 # The most simple HTTP API you've ever seen.
 # Provides status of WireGuard peers.
 # ==============================================================================
diff --git a/wireguard/rootfs/etc/services.d/status/run b/wireguard/rootfs/etc/services.d/status/run
index 9e14793..25a0452 100644
--- a/wireguard/rootfs/etc/services.d/status/run
+++ b/wireguard/rootfs/etc/services.d/status/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: WireGuard
+# Home Assistant Community Add-on: WireGuard
 # Shows current WireGuard status
 # ==============================================================================
 sleep 30
diff --git a/wireguard/rootfs/etc/services.d/wireguard/run b/wireguard/rootfs/etc/services.d/wireguard/run
index f57e618..0c9cd21 100644
--- a/wireguard/rootfs/etc/services.d/wireguard/run
+++ b/wireguard/rootfs/etc/services.d/wireguard/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: WireGuard
+# Home Assistant Community Add-on: WireGuard
 # Runs WireGuard
 # ==============================================================================
 declare interface