diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
index 5ae7e7f..edcb881 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Common/SimpleTestErrorCollectorTest.php
@@ -49,9 +49,9 @@ function testErrorCollect() {
     $this->verbose(print_r($this->collectedErrors, TRUE));
 
     if (count($this->collectedErrors) == 3) {
-      $this->assertError($this->collectedErrors[0], 'Notice', 'Drupal\error_test\Controllers\ErrorTestController->generateWarnings()', 'ErrorTestController.php', 'Undefined variable: bananas');
-      $this->assertError($this->collectedErrors[1], 'Warning', 'Drupal\error_test\Controllers\ErrorTestController->generateWarnings()', 'ErrorTestController.php', 'Division by zero');
-      $this->assertError($this->collectedErrors[2], 'User warning', 'Drupal\error_test\Controllers\ErrorTestController->generateWarnings()', 'ErrorTestController.php', 'Drupal is awesome');
+      $this->assertError($this->collectedErrors[0], 'Notice', 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()', 'ErrorTestController.php', 'Undefined variable: bananas');
+      $this->assertError($this->collectedErrors[1], 'Warning', 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()', 'ErrorTestController.php', 'Division by zero');
+      $this->assertError($this->collectedErrors[2], 'User warning', 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()', 'ErrorTestController.php', 'Drupal is awesome');
     }
     else {
       // Give back the errors to the log report.
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php b/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php
index 7b133dc..7d20be9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/ErrorHandlerTest.php
@@ -37,19 +37,19 @@ function testErrorHandler() {
     $error_notice = array(
       '%type' => 'Notice',
       '!message' => 'Undefined variable: bananas',
-      '%function' => 'Drupal\error_test\Controllers\ErrorTestController->generateWarnings()',
+      '%function' => 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()',
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
     );
     $error_warning = array(
       '%type' => 'Warning',
       '!message' => 'Division by zero',
-      '%function' => 'Drupal\error_test\Controllers\ErrorTestController->generateWarnings()',
+      '%function' => 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()',
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
     );
     $error_user_notice = array(
       '%type' => 'User warning',
       '!message' => 'Drupal is awesome',
-      '%function' => 'Drupal\error_test\Controllers\ErrorTestController->generateWarnings()',
+      '%function' => 'Drupal\error_test\Controller\ErrorTestController->generateWarnings()',
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
     );
 
@@ -97,14 +97,14 @@ function testExceptionHandler() {
     $error_exception = array(
       '%type' => 'Exception',
       '!message' => 'Drupal is awesome',
-      '%function' => 'Drupal\error_test\Controllers\ErrorTestController->triggerException()',
+      '%function' => 'Drupal\error_test\Controller\ErrorTestController->triggerException()',
       '%line' => 56,
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
     );
     $error_pdo_exception = array(
       '%type' => 'DatabaseExceptionWrapper',
       '!message' => 'SELECT * FROM bananas_are_awesome',
-      '%function' => 'Drupal\error_test\Controllers\ErrorTestController->triggerPDOException()',
+      '%function' => 'Drupal\error_test\Controller\ErrorTestController->triggerPDOException()',
       '%line' => 64,
       '%file' => drupal_get_path('module', 'error_test') . '/error_test.module',
     );
diff --git a/core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php b/core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php
index 9fcaf92..124b8f9 100644
--- a/core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php
+++ b/core/modules/system/tests/modules/error_test/lib/Drupal/error_test/Controller/ErrorTestController.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Contains \Drupal\error_test\Controllers\ErrorTestController.
+ * Contains \Drupal\error_test\Controller\ErrorTestController.
  */
 
 namespace Drupal\error_test\Controller;