diff --git a/libraries/entropy/const.py b/libraries/entropy/const.py
index 1b2eff339..e2f38ebdd 100644
--- a/libraries/entropy/const.py
+++ b/libraries/entropy/const.py
@@ -538,9 +538,9 @@ def const_default_settings(rootdir):
         },
 
         'clientserverrepoid': "__system__",
-        'clientdbid': "client",
-        'serverdbid': "etpdb:",
-        'genericdbid': "generic",
+        'clientdbid': "__client__",
+        'serverdbid': "__etpdb:",
+        'genericdbid': "__generic__",
         'systemreleasefile': "/etc/sabayon-release",
 
         # these are constants, for real settings