diff --git a/template/config_options/gpg_allow_key_submission b/template/config_options/gnupg_allow_key_submission
similarity index 100%
rename from template/config_options/gpg_allow_key_submission
rename to template/config_options/gnupg_allow_key_submission
diff --git a/template/config_options/gpg_encrypt_to_all b/template/config_options/gnupg_encrypt_to_all
similarity index 100%
rename from template/config_options/gpg_encrypt_to_all
rename to template/config_options/gnupg_encrypt_to_all
diff --git a/template/config_options/gpg_nokey_nocrypt b/template/config_options/gnupg_keycomment.cs
similarity index 100%
rename from template/config_options/gpg_nokey_nocrypt
rename to template/config_options/gnupg_keycomment.cs
diff --git a/template/config_options/gpg_require_subscriber b/template/config_options/gnupg_keyname.cs
similarity index 100%
rename from template/config_options/gpg_require_subscriber
rename to template/config_options/gnupg_keyname.cs
diff --git a/template/config_options/gpg_sign_messages b/template/config_options/gnupg_keysize.cs
similarity index 100%
rename from template/config_options/gpg_sign_messages
rename to template/config_options/gnupg_keysize.cs
diff --git a/template/config_options/gpg_verified_key_required b/template/config_options/gnupg_keytype.cs
similarity index 100%
rename from template/config_options/gpg_verified_key_required
rename to template/config_options/gnupg_keytype.cs
diff --git a/template/config_options/gnupg_nokey_nocrypt b/template/config_options/gnupg_nokey_nocrypt
new file mode 100644
index 0000000..e69de29
diff --git a/template/config_options/gnupg_require_subscriber b/template/config_options/gnupg_require_subscriber
new file mode 100644
index 0000000..e69de29
diff --git a/template/config_options/gnupg_sign_messages b/template/config_options/gnupg_sign_messages
new file mode 100644
index 0000000..e69de29
diff --git a/template/config_options/gnupg_verified_key_required b/template/config_options/gnupg_verified_key_required
new file mode 100644
index 0000000..e69de29