diff --git a/script/cucchiaiata b/script/cucchiaiata
index 17f66f9..cf46432 100755
--- a/script/cucchiaiata
+++ b/script/cucchiaiata
@@ -10,8 +10,8 @@ from cucchiaiata.i18n import _
 
 def main():
     try:
-        if argv[1] in ['config.session.server.configure',
-                       'config.session.servermodel.configure']:
+        if argv[1] in ['session.server.configure',
+                       'session.servermodel.configure']:
             Configuration().get()
         else:
             parser = Parser()
diff --git a/src/cucchiaiata/config.py b/src/cucchiaiata/config.py
index 2539ae8..ec0445c 100644
--- a/src/cucchiaiata/config.py
+++ b/src/cucchiaiata/config.py
@@ -36,8 +36,8 @@ version: {version}"""
         self.allow_insecure_https = config.get('allow_insecure_https', False)
 
 
-TO_JSON = {'config.session.server.get': ['content'], 
-           'config.session.servermodel.get': ['content'],
+TO_JSON = {'session.server.get': ['content'], 
+           'session.servermodel.get': ['content'],
            'server.describe': ['configuration'],
            'server.exec.describe': ['return']}
 
diff --git a/src/cucchiaiata/configuration.py b/src/cucchiaiata/configuration.py
index f953b56..3d847d3 100644
--- a/src/cucchiaiata/configuration.py
+++ b/src/cucchiaiata/configuration.py
@@ -28,7 +28,7 @@ class ConfigAPI(Config):
 
 class Configuration(Common):
     def configure_server(self):
-        if self.message == 'config.session.server.configure':
+        if self.message == 'session.server.configure':
             type = 'server'
         else:
             type = 'servermodel'
@@ -44,7 +44,7 @@ class Configuration(Common):
     def get_parameters(self):
         parameters = argv.copy()
 
-        # get and remove config.session.xxxxx.configure
+        # get and remove session.xxxxx.configure
         self.message = parameters.pop(1)
 
         # get and remove commandline name