diff --git a/cbox-tree.d/_offline/doc_header.inc b/cbox-tree.d/_offline/doc_header.inc
index 6e8b411..907d88f 100644
--- a/cbox-tree.d/_offline/doc_header.inc
+++ b/cbox-tree.d/_offline/doc_header.inc
@@ -1,9 +1,9 @@
-
+
CryptoBox
-
+
diff --git a/cbox-tree.d/usr/share/cryptobox/templates/header.cs b/cbox-tree.d/usr/share/cryptobox/templates/header.cs
index d5577e2..8634dd4 100644
--- a/cbox-tree.d/usr/share/cryptobox/templates/header.cs
+++ b/cbox-tree.d/usr/share/cryptobox/templates/header.cs
@@ -1,14 +1,14 @@
-
+
CryptoBox
-
+
-
+
diff --git a/validation/test-cases/1-init/020-init_empty_pw/input.curl b/validation/test-cases/1-init/020-init_empty_pw/input.curl
index 7971b80..458ea52 100644
--- a/validation/test-cases/1-init/020-init_empty_pw/input.curl
+++ b/validation/test-cases/1-init/020-init_empty_pw/input.curl
@@ -1,5 +1,5 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=
-data password2=
+data crypto_password=
+data crypto_password2=
data confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/1-init/030-init_different_pw/input.curl b/validation/test-cases/1-init/030-init_different_pw/input.curl
index 5290414..95391da 100644
--- a/validation/test-cases/1-init/030-init_different_pw/input.curl
+++ b/validation/test-cases/1-init/030-init_different_pw/input.curl
@@ -1,5 +1,5 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hall
+data crypto_password=hallo
+data crypto_password2=hall
data confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/1-init/040-init_wrong_confirmation/input.curl b/validation/test-cases/1-init/040-init_wrong_confirmation/input.curl
index 68f3244..34c4cfe 100644
--- a/validation/test-cases/1-init/040-init_wrong_confirmation/input.curl
+++ b/validation/test-cases/1-init/040-init_wrong_confirmation/input.curl
@@ -1,5 +1,5 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hallo
+data crypto_password=hallo
+data crypto_password2=hallo
data confirm=something
diff --git a/validation/test-cases/1-init/060-mount_do_before_init/input.curl b/validation/test-cases/1-init/060-mount_do_before_init/input.curl
index 1286a4e..0882601 100644
--- a/validation/test-cases/1-init/060-mount_do_before_init/input.curl
+++ b/validation/test-cases/1-init/060-mount_do_before_init/input.curl
@@ -1,3 +1,3 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=mount_do
-data password=hallo
+data crypto_password=hallo
diff --git a/validation/test-cases/1-init/110-init_valid/input.curl b/validation/test-cases/1-init/110-init_valid/input.curl
index 98e19f6..1bf94a2 100644
--- a/validation/test-cases/1-init/110-init_valid/input.curl
+++ b/validation/test-cases/1-init/110-init_valid/input.curl
@@ -1,5 +1,5 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hallo
+data crypto_password=hallo
+data crypto_password2=hallo
data confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/1-init/130-mount_do_during_init/input.curl b/validation/test-cases/1-init/130-mount_do_during_init/input.curl
index 1286a4e..0882601 100644
--- a/validation/test-cases/1-init/130-mount_do_during_init/input.curl
+++ b/validation/test-cases/1-init/130-mount_do_during_init/input.curl
@@ -1,3 +1,3 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=mount_do
-data password=hallo
+data crypto_password=hallo
diff --git a/validation/test-cases/1-init/190-init_do_during_init/input.curl b/validation/test-cases/1-init/190-init_do_during_init/input.curl
index 98e19f6..1bf94a2 100644
--- a/validation/test-cases/1-init/190-init_do_during_init/input.curl
+++ b/validation/test-cases/1-init/190-init_do_during_init/input.curl
@@ -1,5 +1,5 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hallo
+data crypto_password=hallo
+data crypto_password2=hallo
data confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/2-mount/020-mount_empty_pw/input.curl b/validation/test-cases/2-mount/020-mount_empty_pw/input.curl
index 0e69d43..803e5da 100644
--- a/validation/test-cases/2-mount/020-mount_empty_pw/input.curl
+++ b/validation/test-cases/2-mount/020-mount_empty_pw/input.curl
@@ -1,3 +1,3 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=mount_do
-data password=
+data crypto_password=
diff --git a/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl b/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
index 1286a4e..0882601 100644
--- a/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
+++ b/validation/test-cases/2-mount/030-mount_do_invalid_pw/input.curl
@@ -1,3 +1,3 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=mount_do
-data password=hallo
+data crypto_password=hallo
diff --git a/validation/test-cases/2-mount/040-mount_do_valid/input.curl b/validation/test-cases/2-mount/040-mount_do_valid/input.curl
index 1286a4e..0882601 100644
--- a/validation/test-cases/2-mount/040-mount_do_valid/input.curl
+++ b/validation/test-cases/2-mount/040-mount_do_valid/input.curl
@@ -1,3 +1,3 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=mount_do
-data password=hallo
+data crypto_password=hallo
diff --git a/validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl b/validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl
index 1286a4e..0882601 100644
--- a/validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl
+++ b/validation/test-cases/2-mount/060-mount_do_while_mounted/input.curl
@@ -1,3 +1,3 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=mount_do
-data password=hallo
+data crypto_password=hallo
diff --git a/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl b/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
index 72327b2..25f4132 100644
--- a/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/010-init_different_admin_pw/input.curl
@@ -1,7 +1,7 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hallo
-data admin_password=root
+data crypto_password=hallo
+data crypto_password2=hallo
+data admin_crypto_password=root
data admin_password2=rootA
data confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
index 43c12eb..b9e3215 100644
--- a/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/020-init_with_admin_pw/input.curl
@@ -1,7 +1,7 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hallo
-data admin_password=root
+data crypto_password=hallo
+data crypto_password2=hallo
+data admin_crypto_password=root
data admin_password2=root
data confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
index 2bdadbd..11be9e6 100644
--- a/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/070-init_wrong_admin_pw/input.curl
@@ -1,8 +1,8 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hallo
-data current_admin_password=rootA
-data admin_password=root
+data crypto_password=hallo
+data crypto_password2=hallo
+data current_admin_crypto_password=rootA
+data admin_crypto_password=root
data admin_password2=root
data confirm=ja%2C%20loesche%20alle%20Daten%21
diff --git a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
index f5b4f03..641b5ea 100644
--- a/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
+++ b/validation/test-cases/4-admin_pw/200-init_remove_admin_pw/input.curl
@@ -1,6 +1,6 @@
url https://_HOST_IP_DEFAULT_/cryptobox
data action=init_do
-data password=hallo
-data password2=hallo
-data current_admin_password=root
+data crypto_password=hallo
+data crypto_password2=hallo
+data current_admin_crypto_password=root
data confirm=ja%2C%20loesche%20alle%20Daten%21