Resolve #3357733 "Drush command"

Closes #3357733

features/cache-rebuild.feature

@@ -10,23 +10,24 @@ Feature: Optionally enforce configs on cache rebuild.
   Scenario: A target module's optional configs are not imported when it is enabled.
     When I am on the homepage
     Then I should see "Config Enforce Devel"
-     And I should not see "Config Enforce Devel -- Test for Drush"
+     And I should not see "Config Enforce -- Test for Drush"
      And I should not see "Drush command appears to work!"
-    When I run 'drush pm-enable -y ce_test_drush_command'
+    When I run 'drush pm-enable -y config_enforce_drush_test'
      And I am on the homepage
     Then I should see "Config Enforce Devel"
-     And I should not see "Config Enforce Devel -- Test for Drush"
+     And I should not see "Config Enforce -- Test for Drush"
      And I should not see "Drush command appears to work!"
 
   Scenario: Configs in a module's `config/optional` are imported when caches are rebuilt, by default.
-    When I run 'drush pm-enable -y ce_test_drush_command'
+   Given I run 'drush pm-enable -y config_enforce_drush_test'
      And I run 'drush cache-rebuild --verbose'
+    When I run 'drush watchdog-show'
     Then I should get:
      """
-     [info] Config Enforce Rebuild was triggered.
+     Config Enforce Rebuild was triggered.
      """
      And I am on the homepage
-    Then I should see "Config Enforce Devel -- Test for Drush"
+    Then I should see "Config Enforce -- Test for Drush"
      And I should see "Drush command appears to work!"
 
   @api
@@ -36,14 +37,14 @@ Feature: Optionally enforce configs on cache rebuild.
      And I uncheck "edit-triggers-cache-rebuild"
      And I press "Save configuration"
     Then I should see "The configuration options have been saved."
-    When I run 'drush pm-enable -y ce_test_drush_command'
+    When I run 'drush pm-enable -y config_enforce_drush_test'
      And I run 'drush cache-rebuild --verbose'
     Then I should not get:
      """
      [info] Config Enforce Rebuild was triggered.
      """
      And I am on the homepage
-    Then I should not see "Config Enforce Devel -- Test for Drush"
+    Then I should not see "Config Enforce -- Test for Drush"
      And I should not see "Drush command appears to work!"
     When I run 'drush config-enforce:enforce --verbose'
     Then I should get:
@@ -51,5 +52,5 @@ Feature: Optionally enforce configs on cache rebuild.
      [success] Config Enforce enforced configs.
      """
      And I am on the homepage
-    Then I should see "Config Enforce Devel -- Test for Drush"
+    Then I should see "Config Enforce -- Test for Drush"
      And I should see "Drush command appears to work!"