diff --git a/config/services/drupal-console/feature.yml b/config/services/drupal-console/feature.yml
index 9351c3b5c..b102fbf8a 100644
--- a/config/services/drupal-console/feature.yml
+++ b/config/services/drupal-console/feature.yml
@@ -1,9 +1,9 @@
 services:
-  feature_debug:
+  console.feature_debug:
     class: Drupal\Console\Command\Features\DebugCommand
     tags:
       - { name: drupal.command }
-  feature_import:
+  console.feature_import:
     class: Drupal\Console\Command\Features\ImportCommand
     tags:
       - { name: drupal.command }
diff --git a/config/services/drupal-console/locale.yml b/config/services/drupal-console/locale.yml
index c88f66310..a498b84e9 100644
--- a/config/services/drupal-console/locale.yml
+++ b/config/services/drupal-console/locale.yml
@@ -1,15 +1,15 @@
 services:
-  translation_status:
+  console.translation_status:
     class: Drupal\Console\Command\Locale\TranslationStatusCommand
     arguments: ['@console.site', '@console.extension_manager']
     tags:
       - { name: drupal.command }
-  language_delete:
+  console.language_delete:
     class: Drupal\Console\Command\Locale\LanguageDeleteCommand
     arguments: ['@console.site', '@entity_type.manager', '@module_handler']
     tags:
       - { name: drupal.command }
-  language_add:
+  console.language_add:
     class: Drupal\Console\Command\Locale\LanguageAddCommand
     arguments: ['@console.site', '@module_handler']
     tags:
diff --git a/config/services/drupal-console/module.yml b/config/services/drupal-console/module.yml
index 5ce402bf6..8c79ef33c 100644
--- a/config/services/drupal-console/module.yml
+++ b/config/services/drupal-console/module.yml
@@ -1,36 +1,35 @@
 services:
-  module_debug:
+  console.module_debug:
     class: Drupal\Console\Command\Module\DebugCommand
     arguments: ['@console.configuration_manager', '@console.site', '@http_client']
     tags:
       - { name: drupal.command }
-  module_dependency_install:
+  console.module_dependency_install:
     class: Drupal\Console\Command\Module\InstallDependencyCommand
     arguments: ['@console.site', '@console.validator', '@module_installer', '@console.chain_queue']
     tags:
       - { name: drupal.command }
-
-  module_download:
+  console.module_download:
     class: Drupal\Console\Command\Module\DownloadCommand
     arguments: ['@console.drupal_api', '@http_client',  '@app.root', '@console.extension_manager', '@console.validator', '@console.site', '@console.configuration_manager', '@console.shell_process', '@console.root']
     tags:
       - { name: drupal.command }
-  module_install:
+  console.module_install:
       class: Drupal\Console\Command\Module\InstallCommand
       arguments: ['@console.site', '@console.validator', '@module_installer', '@console.drupal_api', '@console.extension_manager', '@app.root', '@console.chain_queue']
       tags:
         - { name: drupal.command }
-  module_path:
+  console.module_path:
       class: Drupal\Console\Command\Module\PathCommand
       arguments: ['@console.extension_manager']
       tags:
         - { name: drupal.command }
-  module_uninstall:
+  console.module_uninstall:
     class: Drupal\Console\Command\Module\UninstallCommand
     arguments: ['@console.site','@module_installer', '@console.chain_queue', '@config.factory', '@console.extension_manager']
     tags:
       - { name: drupal.command }
-  module_update:
+  console.module_update:
     class: Drupal\Console\Command\Module\UpdateCommand
     arguments: ['@console.shell_process', '@console.root']
     tags:
diff --git a/config/services/drupal-console/router.yml b/config/services/drupal-console/router.yml
index b79bf43f1..62304e501 100644
--- a/config/services/drupal-console/router.yml
+++ b/config/services/drupal-console/router.yml
@@ -1,5 +1,5 @@
 services:
-  router_debug:
+  console.router_debug:
     class: Drupal\Console\Command\Router\DebugCommand
     arguments: ['@router.route_provider']
     tags:
diff --git a/config/services/drupal-console/theme.yml b/config/services/drupal-console/theme.yml
index 9306e8844..abe36c413 100644
--- a/config/services/drupal-console/theme.yml
+++ b/config/services/drupal-console/theme.yml
@@ -1,25 +1,25 @@
 services:
-  theme_debug:
+  console.theme_debug:
     class: Drupal\Console\Command\Theme\DebugCommand
     arguments: ['@config.factory', '@theme_handler']
     tags:
       - { name: drupal.command }
-  theme_download:
+  console.theme_download:
     class: Drupal\Console\Command\Theme\DownloadCommand
     arguments: ['@console.drupal_api', '@http_client', '@app.root']
     tags:
       - { name: drupal.command }
-  theme_install:
+  console.theme_install:
     class: Drupal\Console\Command\Theme\InstallCommand
     arguments: ['@config.factory', '@theme_handler', '@console.chain_queue']
     tags:
       - { name: drupal.command }
-  theme_path:
+  console.theme_path:
     class: Drupal\Console\Command\Theme\PathCommand
     arguments: ['@console.extension_manager']
     tags:
       - { name: drupal.command }
-  theme_uninstall:
+  console.theme_uninstall:
     class: Drupal\Console\Command\Theme\UninstallCommand
     arguments: ['@config.factory', '@theme_handler', '@console.chain_queue']
     tags:
diff --git a/config/services/drupal-core/migrate.yml b/config/services/drupal-core/migrate.yml
index 42d5746bb..feae3909a 100644
--- a/config/services/drupal-core/migrate.yml
+++ b/config/services/drupal-core/migrate.yml
@@ -1,20 +1,20 @@
 services:
-  migrate_rollback:
+  console.migrate_rollback:
     class: Drupal\Console\Command\Migrate\RollBackCommand
     arguments: ['@plugin.manager.migration']
     tags:
       - { name: drupal.command }
-  migrate_execute:
+  console.migrate_execute:
     class: Drupal\Console\Command\Migrate\ExecuteCommand
     arguments: ['@plugin.manager.migration']
     tags:
       - { name: drupal.command }
-  migrate_debug:
+  console.migrate_debug:
     class: Drupal\Console\Command\Migrate\DebugCommand
     arguments: ['@plugin.manager.migration']
     tags:
       - { name: drupal.command }
-  migrate_setup:
+  console.migrate_setup:
     class: Drupal\Console\Command\Migrate\SetupCommand
     arguments: ['@state', '@plugin.manager.migration']
     tags:
diff --git a/config/services/drupal-core/rest.yml b/config/services/drupal-core/rest.yml
index a5446b6ac..8a5935470 100644
--- a/config/services/drupal-core/rest.yml
+++ b/config/services/drupal-core/rest.yml
@@ -1,15 +1,15 @@
 services:
-  rest_debug:
+  console.rest_debug:
     class: Drupal\Console\Command\Rest\DebugCommand
     arguments: ['@plugin.manager.rest']
     tags:
       - { name: drupal.command }
-  rest_disable:
+  console.rest_disable:
     class: Drupal\Console\Command\Rest\DisableCommand
     arguments: ['@config.factory', '@plugin.manager.rest']
     tags:
       - { name: drupal.command }
-  rest_enable:
+  console.rest_enable:
     class: Drupal\Console\Command\Rest\EnableCommand
     arguments: ['@plugin.manager.rest', '@authentication_collector', '@config.factory', '%serializer.formats%', '@entity.manager']
     tags:
diff --git a/config/services/drupal-core/simpletest.yml b/config/services/drupal-core/simpletest.yml
index 20d3f34b8..862b856a6 100644
--- a/config/services/drupal-core/simpletest.yml
+++ b/config/services/drupal-core/simpletest.yml
@@ -1,10 +1,10 @@
 services:
-  test_debug:
+  console.test_debug:
     class: Drupal\Console\Command\Test\DebugCommand
     arguments: ['@test_discovery']
     tags:
       - { name: drupal.command }
-  test_run:
+  console.test_run:
     class: Drupal\Console\Command\Test\RunCommand
     arguments: ['@app.root', '@test_discovery', '@module_handler', '@date.formatter']
     tags: