diff --git a/.github/settings.yml b/.github/settings.yml
index 6479917..a07245c 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,7 +1,7 @@
 ---
 repository:
-  description: "Home Panel - Community Hass.io Add-on for Home Assistant"
-  topics: home-panel, home-automation, home-assistant, hassio, hassio-addons, hass, javascript, reactjs
+  description: "Home Panel - Home Assistant Community Add-ons"
+  topics: home-panel, home-automation, home-assistant, addon, addons, javascript, reactjs
   homepage: https://addons.community
   private: false
   has_issues: true
diff --git a/README.md b/README.md
index fbf1c41..970e8af 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -40,7 +40,7 @@ A web frontend for controlling the home. Integrates with
 ## 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 "Home Panel" add-on.
@@ -95,13 +95,13 @@ Enables/Disables SSL (HTTPS) on the app. 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_
 
 ## Changelog & Releases
 
@@ -123,7 +123,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.
@@ -149,11 +149,11 @@ The original setup of this repository is by [Timmo][timmo].
 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/home-panel/.README.j2 b/home-panel/.README.j2
index ce6337d..764fee3 100644
--- a/home-panel/.README.j2
+++ b/home-panel/.README.j2
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -25,8 +25,8 @@ A web frontend for controlling the home. Integrates with
 {% 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/home-panel/Dockerfile b/home-panel/Dockerfile
index 916a77a..6f55c7a 100755
--- a/home-panel/Dockerfile
+++ b/home-panel/Dockerfile
@@ -57,4 +57,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-home-panel/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-home-panel" \
-    org.label-schema.vendor="Community Hass.io Add-ons"
+    org.label-schema.vendor="Home Assistant Community Add-ons"
diff --git a/home-panel/config.json b/home-panel/config.json
index cbb62fb..26702aa 100644
--- a/home-panel/config.json
+++ b/home-panel/config.json
@@ -25,7 +25,7 @@
     "80/tcp": null
   },
   "ports_description": {
-    "80/tcp": "Web UI (Not required for Hass.io Ingress)"
+    "80/tcp": "Web UI (Not required for Ingress)"
   },
   "map": [
     "config:rw",
diff --git a/home-panel/rootfs/etc/cont-init.d/discovery.sh b/home-panel/rootfs/etc/cont-init.d/discovery.sh
index 44afcbf..29ac8e8 100644
--- a/home-panel/rootfs/etc/cont-init.d/discovery.sh
+++ b/home-panel/rootfs/etc/cont-init.d/discovery.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Sends discovery information to Home Assistant.
 # ==============================================================================
 declare config
diff --git a/home-panel/rootfs/etc/cont-init.d/nginx.sh b/home-panel/rootfs/etc/cont-init.d/nginx.sh
index 5ece845..503789d 100644
--- a/home-panel/rootfs/etc/cont-init.d/nginx.sh
+++ b/home-panel/rootfs/etc/cont-init.d/nginx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Configures NGINX for use with Home Panel
 # ==============================================================================
 declare port
diff --git a/home-panel/rootfs/etc/cont-init.d/secrets.sh b/home-panel/rootfs/etc/cont-init.d/secrets.sh
index dd95988..89c9707 100644
--- a/home-panel/rootfs/etc/cont-init.d/secrets.sh
+++ b/home-panel/rootfs/etc/cont-init.d/secrets.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # This updates the internal auth secret for the API
 # ==============================================================================
 declare key
diff --git a/home-panel/rootfs/etc/nginx/nginx.conf b/home-panel/rootfs/etc/nginx/nginx.conf
index 7e5bc6f..c2700ac 100644
--- a/home-panel/rootfs/etc/nginx/nginx.conf
+++ b/home-panel/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/home-panel/rootfs/etc/services.d/home-panel/finish b/home-panel/rootfs/etc/services.d/home-panel/finish
index 77ac620..c0e4f5d 100644
--- a/home-panel/rootfs/etc/services.d/home-panel/finish
+++ b/home-panel/rootfs/etc/services.d/home-panel/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Take down the S6 supervision tree when Home Panel fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/home-panel/rootfs/etc/services.d/home-panel/run b/home-panel/rootfs/etc/services.d/home-panel/run
index 5e758bd..08c786b 100644
--- a/home-panel/rootfs/etc/services.d/home-panel/run
+++ b/home-panel/rootfs/etc/services.d/home-panel/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Starts server to serve the app
 # ==============================================================================
 bashio::log.info "Run Home Panel.."
diff --git a/home-panel/rootfs/etc/services.d/nginx/finish b/home-panel/rootfs/etc/services.d/nginx/finish
index 3d87d54..28f667a 100644
--- a/home-panel/rootfs/etc/services.d/nginx/finish
+++ b/home-panel/rootfs/etc/services.d/nginx/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/home-panel/rootfs/etc/services.d/nginx/run b/home-panel/rootfs/etc/services.d/nginx/run
index 713a44a..9e4c453 100644
--- a/home-panel/rootfs/etc/services.d/nginx/run
+++ b/home-panel/rootfs/etc/services.d/nginx/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Runs the Nginx daemon
 # ==============================================================================
 # Wait for Home Panel to become available