diff --git a/.github/settings.yml b/.github/settings.yml
index 98757a9..fcb516b 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,6 +1,6 @@
 ---
 repository:
-  description: "Grocy - Community Home Assistant Add-ons"
+  description: "Grocy - Home Assistant Community Add-ons"
   homepage: https://addons.community
   topics: groceries, food, erp, grocy, addon, addons, home-assistant, homeassistant
   private: false
diff --git a/README.md b/README.md
index e2f1777..7ef85f4 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -220,7 +220,7 @@ Got questions?
 
 You have several options to get them answered:
 
-- The [Community Home Assistant 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.
diff --git a/grocy/.README.j2 b/grocy/.README.j2
index d72ec30..b5f1954 100644
--- a/grocy/.README.j2
+++ b/grocy/.README.j2
@@ -1,4 +1,4 @@
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
diff --git a/grocy/rootfs/etc/cont-init.d/grocy.sh b/grocy/rootfs/etc/cont-init.d/grocy.sh
index 0da89e7..7440e49 100644
--- a/grocy/rootfs/etc/cont-init.d/grocy.sh
+++ b/grocy/rootfs/etc/cont-init.d/grocy.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 # Sets up Grocy before the server starts
 # ==============================================================================
 if ! bashio::fs.directory_exists "/data/grocy"; then
diff --git a/grocy/rootfs/etc/cont-init.d/nginx.sh b/grocy/rootfs/etc/cont-init.d/nginx.sh
index 2623101..a3f5e40 100755
--- a/grocy/rootfs/etc/cont-init.d/nginx.sh
+++ b/grocy/rootfs/etc/cont-init.d/nginx.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 # Configures NGINX for use with Grocy
 # ==============================================================================
 declare certfile
diff --git a/grocy/rootfs/etc/services.d/nginx/finish b/grocy/rootfs/etc/services.d/nginx/finish
index e29d964..9515bd2 100755
--- a/grocy/rootfs/etc/services.d/nginx/finish
+++ b/grocy/rootfs/etc/services.d/nginx/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 # Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
 if { s6-test ${1} -ne 0 }
diff --git a/grocy/rootfs/etc/services.d/nginx/run b/grocy/rootfs/etc/services.d/nginx/run
index 897aee7..d6456a7 100755
--- a/grocy/rootfs/etc/services.d/nginx/run
+++ b/grocy/rootfs/etc/services.d/nginx/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 # Runs the Nginx daemon
 # ==============================================================================
 
diff --git a/grocy/rootfs/etc/services.d/php-fpm/finish b/grocy/rootfs/etc/services.d/php-fpm/finish
index 77ace55..69ae6a2 100644
--- a/grocy/rootfs/etc/services.d/php-fpm/finish
+++ b/grocy/rootfs/etc/services.d/php-fpm/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 # Take down the S6 supervision tree when PHP FPM fails
 # ==============================================================================
 if { s6-test ${1} -ne 0 }
diff --git a/grocy/rootfs/etc/services.d/php-fpm/run b/grocy/rootfs/etc/services.d/php-fpm/run
index b92a3dc..c628ac5 100644
--- a/grocy/rootfs/etc/services.d/php-fpm/run
+++ b/grocy/rootfs/etc/services.d/php-fpm/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-on: Grocy
+# Home Assistant Community Add-on: Grocy
 # Runs the PHP-FPM daemon
 # ==============================================================================
 export GROCY_CULTURE