diff --git a/common/ota-update-password.yaml b/common/ota-update-password.yaml
index a4821fd..93fd627 100644
--- a/common/ota-update-password.yaml
+++ b/common/ota-update-password.yaml
@@ -1,5 +1,5 @@
 substitutions:
-  ota_password: !secret fallback_ota_password
+  ota_password: !secret default_ota_password
   ota_new_password: ""
   ota_update_password: 0
 
diff --git a/common/ota.yaml b/common/ota.yaml
index a5083d5..f1612c6 100644
--- a/common/ota.yaml
+++ b/common/ota.yaml
@@ -1,5 +1,5 @@
 substitutions:
-  ota_password: !secret fallback_ota_password
+  ota_password: !secret default_ota_password
 
 ota:
   - platform: esphome
diff --git a/huacaoe-tywb-4ch-common.yaml b/huacaoe-tywb-4ch-common.yaml
index a46b377..120308b 100644
--- a/huacaoe-tywb-4ch-common.yaml
+++ b/huacaoe-tywb-4ch-common.yaml
@@ -60,7 +60,7 @@ api:
 wifi:
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
-    password: !secret fallback_ap_password
+    password: !secret default_ap_password
 
 captive_portal:
 
diff --git a/secrets.example.yaml b/secrets.example.yaml
index b7d500e..5594557 100644
--- a/secrets.example.yaml
+++ b/secrets.example.yaml
@@ -1,2 +1,2 @@
-fallback_ap_password: ""
-fallback_ota_password: ""
+default_ap_password: ""
+default_ota_password: ""
diff --git a/shelly-em-gen3.yaml b/shelly-em-gen3.yaml
index b629928..6965f24 100644
--- a/shelly-em-gen3.yaml
+++ b/shelly-em-gen3.yaml
@@ -98,7 +98,7 @@ wifi:
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
-    password: !secret fallback_ap_password
+    password: !secret default_ap_password
 
 captive_portal:
 
diff --git a/shelly-plus-1pm-ul.yaml b/shelly-plus-1pm-ul.yaml
index 8cd5ce0..a02661f 100644
--- a/shelly-plus-1pm-ul.yaml
+++ b/shelly-plus-1pm-ul.yaml
@@ -81,7 +81,7 @@ wifi:
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
-    password: !secret fallback_ap_password
+    password: !secret default_ap_password
 
 # web_server:
 
diff --git a/shelly-plus-i4.yaml b/shelly-plus-i4.yaml
index 679e834..b1d2538 100644
--- a/shelly-plus-i4.yaml
+++ b/shelly-plus-i4.yaml
@@ -75,7 +75,7 @@ wifi:
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
-    password: !secret fallback_ap_password
+    password: !secret default_ap_password
 
 # web_server:
 
diff --git a/shelly-pm-mini-gen3.yaml b/shelly-pm-mini-gen3.yaml
index acb4ea3..3abf2f2 100644
--- a/shelly-pm-mini-gen3.yaml
+++ b/shelly-pm-mini-gen3.yaml
@@ -62,7 +62,7 @@ wifi:
 
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
-    password: !secret fallback_ap_password
+    password: !secret default_ap_password
 
 captive_portal: