diff --git a/.github/settings.yml b/.github/settings.yml
index dc5d3e7..3808ff7 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,6 +1,6 @@
 ---
 repository:
-  description: "AirSonos - Community Home Assistant Add-ons"
+  description: "AirSonos - Home Assistant Community Add-ons"
   homepage: https://addons.community
   topics: airsonos, airplay, sonos, unpnp, addon, addons, home-assistant, homeassistant
   private: false
diff --git a/README.md b/README.md
index e9ea5e7..7af3822 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Home Assistant Add-on: AirSonos
+# Home Assistant Community Add-on: AirSonos
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -219,7 +219,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/airsonos/.README.j2 b/airsonos/.README.j2
index 88d8a23..f08f34d 100644
--- a/airsonos/.README.j2
+++ b/airsonos/.README.j2
@@ -1,4 +1,4 @@
-# Community Home Assistant Add-on: AirSonos
+# Home Assistant Community Add-on: AirSonos
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
diff --git a/airsonos/Dockerfile b/airsonos/Dockerfile
index 8f02d8e..f471ae7 100755
--- a/airsonos/Dockerfile
+++ b/airsonos/Dockerfile
@@ -45,4 +45,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-airsonos/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-airsonos" \
-    org.label-schema.vendor="Community Home Assistant Add-ons"
+    org.label-schema.vendor="Home Assistant Community Add-ons"
diff --git a/airsonos/rootfs/etc/cont-init.d/airsonos.sh b/airsonos/rootfs/etc/cont-init.d/airsonos.sh
index d53f97e..7015d04 100644
--- a/airsonos/rootfs/etc/cont-init.d/airsonos.sh
+++ b/airsonos/rootfs/etc/cont-init.d/airsonos.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-on: AirSonos
+# Home Assistant Community Add-on: AirSonos
 # Checks latency settings before starting the AirSonos server
 # ==============================================================================
 declare latency
diff --git a/airsonos/rootfs/etc/services.d/airsonos/finish b/airsonos/rootfs/etc/services.d/airsonos/finish
index 9ace8f1..0d9fbd9 100644
--- a/airsonos/rootfs/etc/services.d/airsonos/finish
+++ b/airsonos/rootfs/etc/services.d/airsonos/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Home Assistant Add-on: AirSonos
+# Home Assistant Community Add-on: AirSonos
 # Take down the S6 supervision tree when the AirSonos server fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/airsonos/rootfs/etc/services.d/airsonos/run b/airsonos/rootfs/etc/services.d/airsonos/run
index 759756b..a4a5bdf 100644
--- a/airsonos/rootfs/etc/services.d/airsonos/run
+++ b/airsonos/rootfs/etc/services.d/airsonos/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Home Assistant Add-on: AirSonos
+# Home Assistant Community Add-on: AirSonos
 # Runs the AirSonos server
 # ==============================================================================
 declare -a options