diff --git a/modules/services.sh b/modules/services.sh
index bbc8a93131..79bbb7ffa6 100644
--- a/modules/services.sh
+++ b/modules/services.sh
@@ -19,7 +19,7 @@ function services {
         do
           if [[ ! $file = *"README.md"* ]]; then
             service=$(echo "${file##*/}" | sed -e 's/^install-//' -e 's/.sh$//')
-            if check_arm $service; then
+            if check_arch $service; then
               echo $service
             fi
           fi
@@ -492,11 +492,10 @@ function services {
   esac
 }
 
-function check_arm {
-  arms=($(source $SERVICES/install-${1}.sh && supported_arms))
-  for i in "${arms[@]}"
-  do
-    if [ "$(detect arch)" = "$i" ]; then
+function check_arch {
+  arches=($(source $SERVICES/install-${1}.sh && supported_arches))
+  for i in "${arches[@]}"; do
+    if [ "$(detect arch)" == "$i" ]; then
       return 0
     fi
   done
diff --git a/package.json b/package.json
index 146ae9e4f0..a2362f4803 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@treehouses/cli",
-  "version": "1.25.3",
+  "version": "1.25.4",
   "remote": "4000",
   "description": "Thin command-line interface for Raspberry Pi low level configuration.",
   "main": "cli.sh",
diff --git a/services/install-bookstack.sh b/services/install-bookstack.sh
index d64c997228..62542035d4 100644
--- a/services/install-bookstack.sh
+++ b/services/install-bookstack.sh
@@ -65,8 +65,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-cloud9.sh b/services/install-cloud9.sh
index bf74552c89..194ffc0d0c 100644
--- a/services/install-cloud9.sh
+++ b/services/install-cloud9.sh
@@ -35,8 +35,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-couchdb.sh b/services/install-couchdb.sh
index 7f59e3da63..f43ee7c4a7 100644
--- a/services/install-couchdb.sh
+++ b/services/install-couchdb.sh
@@ -34,8 +34,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"
diff --git a/services/install-dokuwiki.sh b/services/install-dokuwiki.sh
index 3139f995e6..bb013c3aa6 100644
--- a/services/install-dokuwiki.sh
+++ b/services/install-dokuwiki.sh
@@ -39,8 +39,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-grocy.sh b/services/install-grocy.sh
index 2d0ffdf191..4f006eb656 100644
--- a/services/install-grocy.sh
+++ b/services/install-grocy.sh
@@ -51,8 +51,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"
diff --git a/services/install-invoiceninja.sh b/services/install-invoiceninja.sh
index 6554651f0c..c3719e06cb 100644
--- a/services/install-invoiceninja.sh
+++ b/services/install-invoiceninja.sh
@@ -171,8 +171,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
 }
 
diff --git a/services/install-jellyfin.sh b/services/install-jellyfin.sh
index 35ed76d505..3d965b00a3 100644
--- a/services/install-jellyfin.sh
+++ b/services/install-jellyfin.sh
@@ -50,7 +50,7 @@ function uses_env {
 }
 
 # add supported arch(es)
-function supported_arms {
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-kolibri.sh b/services/install-kolibri.sh
index 5904422ff7..9f8a798bec 100644
--- a/services/install-kolibri.sh
+++ b/services/install-kolibri.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
 }
diff --git a/services/install-librespeed.sh b/services/install-librespeed.sh
index 306ffe8744..6173636ee9 100644
--- a/services/install-librespeed.sh
+++ b/services/install-librespeed.sh
@@ -54,8 +54,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"
diff --git a/services/install-mariadb.sh b/services/install-mariadb.sh
index 2659501ce0..a716c96f0f 100644
--- a/services/install-mariadb.sh
+++ b/services/install-mariadb.sh
@@ -38,8 +38,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
 }
diff --git a/services/install-mastodon.sh b/services/install-mastodon.sh
index 51ccd220ea..63d318bb8a 100644
--- a/services/install-mastodon.sh
+++ b/services/install-mastodon.sh
@@ -73,8 +73,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
 }
 
diff --git a/services/install-minetest.sh b/services/install-minetest.sh
index 4bb6054b5c..d4ea2796b4 100644
--- a/services/install-minetest.sh
+++ b/services/install-minetest.sh
@@ -47,8 +47,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"
diff --git a/services/install-mongodb.sh b/services/install-mongodb.sh
index cc48bc0c6c..b503c307f4 100644
--- a/services/install-mongodb.sh
+++ b/services/install-mongodb.sh
@@ -46,8 +46,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
 }
diff --git a/services/install-moodle.sh b/services/install-moodle.sh
index 40bd83cc17..9be990e5a8 100644
--- a/services/install-moodle.sh
+++ b/services/install-moodle.sh
@@ -59,8 +59,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
 }
diff --git a/services/install-musicblocks.sh b/services/install-musicblocks.sh
index 0c5c58bcf8..fefd73a2ec 100644
--- a/services/install-musicblocks.sh
+++ b/services/install-musicblocks.sh
@@ -31,8 +31,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"
diff --git a/services/install-netdata.sh b/services/install-netdata.sh
index 3f9034c1bd..170b2e3cc4 100644
--- a/services/install-netdata.sh
+++ b/services/install-netdata.sh
@@ -41,8 +41,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"
diff --git a/services/install-nextcloud.sh b/services/install-nextcloud.sh
index 169fb80527..8a6de0574c 100644
--- a/services/install-nextcloud.sh
+++ b/services/install-nextcloud.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "x86_64"
   echo "aarch64"
diff --git a/services/install-ntopng.sh b/services/install-ntopng.sh
index bc9ba00b67..5a24d7db0d 100644
--- a/services/install-ntopng.sh
+++ b/services/install-ntopng.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
 }
 
diff --git a/services/install-pihole.sh b/services/install-pihole.sh
index 0c638da277..938520a426 100644
--- a/services/install-pihole.sh
+++ b/services/install-pihole.sh
@@ -65,8 +65,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "aarch64"
diff --git a/services/install-piwigo.sh b/services/install-piwigo.sh
index 405b9cd20f..8e2ee03685 100755
--- a/services/install-piwigo.sh
+++ b/services/install-piwigo.sh
@@ -57,8 +57,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-planet.sh b/services/install-planet.sh
index 365dbaecf1..9ca9ca2cb8 100644
--- a/services/install-planet.sh
+++ b/services/install-planet.sh
@@ -67,8 +67,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
 }
diff --git a/services/install-portainer.sh b/services/install-portainer.sh
index 29bf4c1e26..5e8351ecd0 100644
--- a/services/install-portainer.sh
+++ b/services/install-portainer.sh
@@ -36,8 +36,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"
diff --git a/services/install-privatebin.sh b/services/install-privatebin.sh
index 04d1b23ce0..ef750632fa 100644
--- a/services/install-privatebin.sh
+++ b/services/install-privatebin.sh
@@ -33,8 +33,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "aarch64"
diff --git a/services/install-pylon.sh b/services/install-pylon.sh
index 1ce5e1c733..13c4a0a47f 100644
--- a/services/install-pylon.sh
+++ b/services/install-pylon.sh
@@ -44,8 +44,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-rutorrent.sh b/services/install-rutorrent.sh
index 6aa17b34d8..c9133e6a63 100644
--- a/services/install-rutorrent.sh
+++ b/services/install-rutorrent.sh
@@ -42,8 +42,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-seafile.sh b/services/install-seafile.sh
index 556f649fde..3b39a1bbf5 100644
--- a/services/install-seafile.sh
+++ b/services/install-seafile.sh
@@ -51,8 +51,8 @@ function uses_env {
   echo true
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"
diff --git a/services/install-transmission.sh b/services/install-transmission.sh
index c891acbb05..35a7ece88c 100755
--- a/services/install-transmission.sh
+++ b/services/install-transmission.sh
@@ -44,8 +44,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "aarch64"
   echo "x86_64"
diff --git a/services/install-turtleblocksjs.sh b/services/install-turtleblocksjs.sh
index c3d539bf0c..3997ffab1e 100644
--- a/services/install-turtleblocksjs.sh
+++ b/services/install-turtleblocksjs.sh
@@ -31,8 +31,8 @@ function uses_env {
   echo false
 }
 
-# add supported arm(s)
-function supported_arms {
+# add supported arch(es)
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "x86_64"
diff --git a/services/install-webssh.sh b/services/install-webssh.sh
index e47c269bc9..1c4d25bcd4 100755
--- a/services/install-webssh.sh
+++ b/services/install-webssh.sh
@@ -37,7 +37,7 @@ function uses_env {
 }
 
 # add supported arch(es)
-function supported_arms {
+function supported_arches {
   echo "armv7l"
   echo "armv6l"
   echo "aarch64"