diff --git a/trains/backend_interface/task/task.py b/trains/backend_interface/task/task.py
index 181babbd..ba9102cd 100644
--- a/trains/backend_interface/task/task.py
+++ b/trains/backend_interface/task/task.py
@@ -61,6 +61,7 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
     _anonymous_dataview_id = '__anonymous__'
     _development_tag = 'development'
     _default_configuration_section_name = 'General'
+    _legacy_parameters_section_name = 'Args'
     _force_requirements = {}
 
     _store_diff = config.get('development.store_uncommitted_code_diff', False)
@@ -796,7 +797,7 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
         else:
             for section in hyperparams:
                 for key, section_param in hyperparams[section].items():
-                    if section_param.type == 'legacy' and section in (self._default_configuration_section_name, ):
+                    if section_param.type == 'legacy' and section in (self._legacy_parameters_section_name, ):
                         parameters['{}'.format(key)] = section_param.value
                     else:
                         parameters['{}/{}'.format(section, key)] = section_param.value
@@ -877,7 +878,7 @@ class Task(IdObjectBase, AccessMixin, SetupUploadMixin):
                 org_hyperparams = self.data.hyperparams or {}
                 hyperparams = dict()
                 # if the task is a legacy task, we should put everything back under General/key with legacy type
-                legacy_name = self._default_configuration_section_name
+                legacy_name = self._legacy_parameters_section_name
                 org_legacy_section = org_hyperparams.get(legacy_name, dict())
 
                 for k, v in parameters.items():
diff --git a/trains/config/default/__main__.py b/trains/config/default/__main__.py
index 64f9c8b3..410bacf6 100644
--- a/trains/config/default/__main__.py
+++ b/trains/config/default/__main__.py
@@ -137,6 +137,7 @@ def main():
                      '    web_server: %s\n' \
                      '    files_server: %s\n' \
                      '    # Credentials are generated using the webapp, %s/profile\n' \
+                     '    # Override with os environment: TRAINS_API_ACCESS_KEY / TRAINS_API_SECRET_KEY\n' \
                      '    credentials {"access_key": "%s", "secret_key": "%s"}\n' \
                      '}\n' \
                      'sdk ' % (api_host, web_host, files_host,