diff --git a/core/modules/rest/src/Plugin/rest/resource/UserRegistrationResource.php b/core/modules/rest/src/Plugin/rest/resource/UserRegistrationResource.php
index 641ee69..d5ce5cc 100644
--- a/core/modules/rest/src/Plugin/rest/resource/UserRegistrationResource.php
+++ b/core/modules/rest/src/Plugin/rest/resource/UserRegistrationResource.php
@@ -1,15 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains Drupal\rest\Plugin\rest\resource\UserRegistrationResource.
- */
-
 namespace Drupal\rest\Plugin\rest\resource;
 
 use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\rest\UncacheableResourceResponse;
+use Drupal\rest\NonCacheableResourceResponse;
 use Drupal\user\UserInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -89,7 +84,7 @@ public static function create(ContainerInterface $container, array $configuratio
    * @param \Drupal\user\UserInterface $account
    *   The user account entity.
    *
-   * @return \Drupal\rest\UncacheableResourceResponse
+   * @return \Drupal\rest\NonCacheableResourceResponse
    *   The HTTP response object.
    *
    * @throws \Symfony\Component\HttpKernel\Exception\HttpException
@@ -154,7 +149,7 @@ public function post(UserInterface $account = NULL) {
     }
 
     $url = $account->urlInfo('canonical', ['absolute' => TRUE])->toString(TRUE);
-    $response = new UncacheableResourceResponse(NULL, 201, ['Location' => $url->getGeneratedUrl()]);
+    $response = new NonCacheableResourceResponse(NULL, 201, ['Location' => $url->getGeneratedUrl()]);
 
     return $response;
   }
diff --git a/core/modules/rest/src/Tests/RegisterUserTest.php b/core/modules/rest/src/Tests/RegisterUserTest.php
index a5e2d58..d2b5c4a 100644
--- a/core/modules/rest/src/Tests/RegisterUserTest.php
+++ b/core/modules/rest/src/Tests/RegisterUserTest.php
@@ -1,11 +1,7 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\rest\Tests\RegisterUserTest.
- */
-
 namespace Drupal\rest\Tests;
+
 use Drupal\user\Entity\Role;
 use Drupal\user\RoleInterface;
 
diff --git a/core/modules/rest/tests/src/Unit/UserRegistrationResourceTest.php b/core/modules/rest/tests/src/Unit/UserRegistrationResourceTest.php
index 6ac54f0..28cfcbe 100644
--- a/core/modules/rest/tests/src/Unit/UserRegistrationResourceTest.php
+++ b/core/modules/rest/tests/src/Unit/UserRegistrationResourceTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\rest\Unit\UserRegistrationResourceTest.
- */
-
 namespace Drupal\Tests\rest\Unit;
 
 use Drupal\Core\Config\ImmutableConfig;