diff --git a/build-image/openhabian.conf b/build-image/openhabian.conf
index 5cbe7053e..9418bea85 100644
--- a/build-image/openhabian.conf
+++ b/build-image/openhabian.conf
@@ -38,8 +38,8 @@ clonebranch=master
 mode=unattended
 
 # Hardware
-# Pi0, Pi0W, Pi1, CM1, Pi2, Pi3, CM3, Pi3+, CM3+, Pi4
-#hw=Pi3
+# pi0, pi0w, pi1, cm1, pi2, pi3, cm3, pi3+, cm3+, pi4
+#hw=pi3
 
 # Hardware architecture
 # x86_64, amd64, armv6l, armv7l, aarch64, arm64
diff --git a/build-image/openhabian.pi-raspbian.conf b/build-image/openhabian.pi-raspbian.conf
index 48d30d500..04ee33fec 100644
--- a/build-image/openhabian.pi-raspbian.conf
+++ b/build-image/openhabian.pi-raspbian.conf
@@ -38,8 +38,8 @@ clonebranch=master
 mode=unattended
 
 # Hardware
-# Pi0, Pi0W, Pi1, CM1, Pi2, Pi3, CM3, Pi3+, CM3+, Pi4
-#hw=Pi3
+# pi0, pi0w, pi1, cm1, pi2, pi3, cm3, pi3+, cm3+, pi4
+#hw=pi3
 
 # Hardware architecture
 # x86_64, amd64, armv6l, armv7l, aarch64, arm64
diff --git a/functions/helpers.bash b/functions/helpers.bash
index c498c8ad7..bb7f28356 100644
--- a/functions/helpers.bash
+++ b/functions/helpers.bash
@@ -34,17 +34,17 @@ cond_echo() {
 
 is_pizero() {
   # shellcheck disable=SC2154
-  if [[ "$hw" == "Pi0" ]]; then return 0; fi
+  if [[ "$hw" == "pi0" ]]; then return 0; fi
   grep -q "^Revision\\s*:\\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]09[0-9a-fA-F]$" /proc/cpuinfo
   return $?
 }
 is_pizerow() {
-  if [[ "$hw" == "Pi0W" ]]; then return 0; fi
+  if [[ "$hw" == "pi0w" ]]; then return 0; fi
   grep -q "^Revision\\s*:\\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]0[cC][0-9a-fA-F]$" /proc/cpuinfo
   return $?
 }
 is_pione() {
-  if [[ "$hw" == "Pi1" ]]; then return 0; fi
+  if [[ "$hw" == "pi1" ]]; then return 0; fi
   if grep -q "^Revision\\s*:\\s*00[0-9a-fA-F][0-9a-fA-F]$" /proc/cpuinfo; then
     return 0
   elif grep -q "^Revision\\s*:\\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]0[0-36][0-9a-fA-F]$" /proc/cpuinfo; then
@@ -54,22 +54,22 @@ is_pione() {
   fi
 }
 is_pitwo() {
-  if [[ "$hw" == "Pi2" ]]; then return 0; fi
+  if [[ "$hw" == "pi2" ]]; then return 0; fi
   grep -q "^Revision\\s*:\\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]04[0-9a-fA-F]$" /proc/cpuinfo
   return $?
 }
 is_pithree() {
-  if [[ "$hw" == "Pi3" ]]; then return 0; fi
+  if [[ "$hw" == "pi3" ]]; then return 0; fi
   grep -q "^Revision\\s*:\\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]08[0-9a-fA-F]$" /proc/cpuinfo
   return $?
 }
 is_pithreeplus() {
-  if [[ "$hw" == "Pi3+" ]]; then return 0; fi
+  if [[ "$hw" == "pi3+" ]]; then return 0; fi
   grep -q "^Revision\\s*:\\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]0d[0-9a-fA-F]$" /proc/cpuinfo
   return $?
 }
 is_pifour() {
-  if [[ "$hw" == "Pi4" ]]; then return 0; fi
+  if [[ "$hw" == "pi4" ]]; then return 0; fi
   ! grep -q "^Revision\\s*:\\s*[ 123][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]11[0-9a-fA-F]$" /proc/cpuinfo
   return $?
 }
diff --git a/openhabian.conf.dist b/openhabian.conf.dist
index a45101756..96aa73dc6 100644
--- a/openhabian.conf.dist
+++ b/openhabian.conf.dist
@@ -37,8 +37,8 @@ clonebranch=master
 mode=unattended
 
 # Hardware
-# Pi0, Pi0W, Pi1, CM1, Pi2, Pi3, CM3, Pi3+, CM3+, Pi4
-#hw=Pi3
+# pi0, pi0w, pi1, cm1, pi2, pi3, cm3, pi3+, cm3+, pi4
+#hw=pi3
 
 # Hardware architecture
 # x86_64, amd64, armv6l, armv7l, aarch64, arm64