diff --git a/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUIConfig.java b/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUIConfig.java
index 930d52bb4..471522dc0 100644
--- a/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUIConfig.java
+++ b/admin-ui/src/main/java/eu/knowledge/engine/admin/AdminUIConfig.java
@@ -3,11 +3,11 @@
 public class AdminUIConfig {
 
 	/**
-	 * The key to configure how long (in milliseconds) should the Admin UI wait
+	 * The key to configure how long (in milliseconds) should the MetadataKB wait
 	 * until it tries to ask for all KBs in the network. This value should probably
 	 * be higher in distributed mode, to allow the participants to reach equilibrium
 	 * with respect to knowledge about each other.
 	 */
-	public static final String CONF_KEY_INITIAL_ADMIN_UI_DELAY = "initial.admin.ui.delay";
+	public static final String CONF_KEY_INITIAL_METADATA_DELAY = "initial.metadata.delay";
 
 }
diff --git a/admin-ui/src/main/java/eu/knowledge/engine/admin/MetadataKB.java b/admin-ui/src/main/java/eu/knowledge/engine/admin/MetadataKB.java
index a6316d8cc..fcad2df0e 100644
--- a/admin-ui/src/main/java/eu/knowledge/engine/admin/MetadataKB.java
+++ b/admin-ui/src/main/java/eu/knowledge/engine/admin/MetadataKB.java
@@ -105,7 +105,7 @@ public void syncKIs() {
 			// to receive the initial state, we do a single Ask (after sleeping for a
 			// specific amount of time)
 			try {
-				Thread.sleep(ConfigProvider.getConfig().getValue(AdminUIConfig.CONF_KEY_INITIAL_ADMIN_UI_DELAY,
+				Thread.sleep(ConfigProvider.getConfig().getValue(AdminUIConfig.CONF_KEY_INITIAL_METADATA_DELAY,
 						Integer.class));
 			} catch (InterruptedException e) {
 				LOG.error("Initial metadata KB delay should not fail.", e);
diff --git a/admin-ui/src/main/resources/META-INF/microprofile-config.properties b/admin-ui/src/main/resources/META-INF/microprofile-config.properties
index 01929b25d..3849e889f 100644
--- a/admin-ui/src/main/resources/META-INF/microprofile-config.properties
+++ b/admin-ui/src/main/resources/META-INF/microprofile-config.properties
@@ -1 +1 @@
-initial.admin.ui.delay = 5000
\ No newline at end of file
+initial.metadata.delay = 5000
\ No newline at end of file