diff --git a/.env.sample b/.env.sample
index 7e0c7f7..0f0739d 100644
--- a/.env.sample
+++ b/.env.sample
@@ -9,6 +9,6 @@ COMPOSE_FILE="compose.yml"
 
 LETS_ENCRYPT_ENV=production
 
-SECRET_TEST_PASSWORD_VERSION=v1
-SECRET_TP_VERSION=v1 # length=10
-#SECRET_EXTRA_VERSION=v1
+SECRET_TEST_PASS_ONE_VERSION=v1
+SECRET_TEST_PASS_TWO_VERSION=v1 # length=10
+#SECRET_EXTRA_PASS_VERSION=v1
diff --git a/compose.extra_secret.yml b/compose.extra_secret.yml
index 3483a0a..9547088 100644
--- a/compose.extra_secret.yml
+++ b/compose.extra_secret.yml
@@ -4,9 +4,9 @@ version: "3.8"
 services:
   app:
     secrets:
-      - extra
+      - extra_pass
 
 secrets:
-  extra:
+  extra_pass:
     external: true
-    name: ${STACK_NAME}_extra_${SECRET_EXTRA_VERSION}
+    name: ${STACK_NAME}_extra_pass_${SECRET_EXTRA_PASS_VERSION}
diff --git a/compose.yml b/compose.yml
index d4b3eb2..223515a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -9,8 +9,8 @@ services:
     volumes:
       - test-volume:/var/www
     secrets:
-      - test_password
-      - tp
+      - test_pass_one
+      - test_pass_two
     deploy:
       restart_policy:
         condition: on-failure
@@ -40,12 +40,12 @@ services:
       start_period: 1m
 
 secrets:
-  test_password:
+  test_pass_one:
     external: true
-    name: ${STACK_NAME}_test_password_${SECRET_TEST_PASSWORD_VERSION}
-  tp:
+    name: ${STACK_NAME}_test_pass_one_${SECRET_TEST_PASS_ONE_VERSION}
+  test_pass_two:
     external: true
-    name: ${STACK_NAME}_tp_${SECRET_TP_VERSION}
+    name: ${STACK_NAME}_test_pass_two_${SECRET_TEST_PASS_TWO_VERSION}
 
 volumes:
   test-volume: