diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3d86a9..ead1f34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,7 @@ easywksserver_gpgwksclient:
       mailing_method: stdout
       domains:
         example.org:
-          submission_address: gpgwks@example.org
+          submission_address: webkey@example.org
       EOF
     - easywks --config /tmp/easywks.yml init
     - easywks --config /tmp/easywks.yml webserver &
@@ -64,7 +64,7 @@ easywksserver_gpgwksclient:
     - >-
       export FINGERPRINT="$(gpg --with-colons --fingerprint alice@example.org | grep -A1 ^pub | grep ^fpr | cut -d: -f10)"
     - /usr/lib/gnupg/gpg-wks-client --supported alice@example.org
-    - /usr/lib/gnupg/gpg-wks-client --check gpgwks@example.org
+    - /usr/lib/gnupg/gpg-wks-client --check webkey@example.org
     - PUBREQ="$(/usr/lib/gnupg/gpg-wks-client --create "${FINGERPRINT}" alice@example.org)"
     - CONFREQ="$(echo "${PUBREQ}" | easywks --config /tmp/easywks.yml process)"
     - CONFRESP="$(echo "${CONFREQ}" | /usr/lib/gnupg/gpg-wks-client --receive --verbose)"
diff --git a/easywks/config.py b/easywks/config.py
index fe662e8..fefed65 100644
--- a/easywks/config.py
+++ b/easywks/config.py
@@ -173,7 +173,7 @@ class _GlobalConfig(_Config):
 
     def __make_domain(self, domain):
         self.__domains[domain] = _Config(
-            submission_address=_ConfigOption('address', str, f'gpgwks@{domain}'),
+            submission_address=_ConfigOption('submission_address', str, f'gpgwks@{domain}'),
             passphrase=_ConfigOption('passphrase', str, ''),
             policy_flags=_ConfigOption('policy_flags', dict, {}, validator=_validate_policy_flags)
         )
@@ -194,7 +194,7 @@ class _GlobalConfig(_Config):
         for domain, dconf in conf['domains'].items():
             self.__make_domain(domain)
             for co in self.__domains[domain]._options.values():
-                co.load(conf)
+                co.load(dconf)
 
 
 Config = _GlobalConfig(