diff --git a/core/modules/comment/lib/Drupal/comment/FieldNewValue.php b/core/modules/comment/lib/Drupal/comment/CommentNewValue.php
similarity index 91%
rename from core/modules/comment/lib/Drupal/comment/FieldNewValue.php
rename to core/modules/comment/lib/Drupal/comment/CommentNewValue.php
index 52875ca..676b611 100644
--- a/core/modules/comment/lib/Drupal/comment/FieldNewValue.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentNewValue.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\comment\FieldNewValue.
+ * Contains \Drupal\comment\CommentNewValue.
  */
 
 namespace Drupal\comment;
@@ -16,7 +16,7 @@
  *
  * @todo: Declare the list of allowed values once supported.
  */
-class FieldNewValue extends ContextAwareTypedData {
+class CommentNewValue extends ContextAwareTypedData {
 
   /**
    * Implements \Drupal\Core\TypedData\TypedDataInterface::getValue().
diff --git a/core/modules/comment/lib/Drupal/comment/CommentStorageController.php b/core/modules/comment/lib/Drupal/comment/CommentStorageController.php
index 6851be0..9324f12 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentStorageController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentStorageController.php
@@ -352,7 +352,7 @@ public function baseFieldDefinitions() {
       'description' => t("The comment 'new' marker for the current user (0 read, 1 new, 2 updated)."),
       'type' => 'integer_field',
       'computed' => TRUE,
-      'class' => '\Drupal\comment\FieldNewItem',
+      'class' => '\Drupal\comment\Type\CommentNewItem',
     );
     return $properties;
   }
diff --git a/core/modules/comment/lib/Drupal/comment/FieldNewItem.php b/core/modules/comment/lib/Drupal/comment/Type/CommentNewItem.php
similarity index 78%
rename from core/modules/comment/lib/Drupal/comment/FieldNewItem.php
rename to core/modules/comment/lib/Drupal/comment/Type/CommentNewItem.php
index 7ef4092..fae4163 100644
--- a/core/modules/comment/lib/Drupal/comment/FieldNewItem.php
+++ b/core/modules/comment/lib/Drupal/comment/Type/CommentNewItem.php
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * Contains \Drupal\comment\FieldNewItem.
+ * Contains \Drupal\comment\Type\CommentNewItem.
  */
 
-namespace Drupal\comment;
+namespace Drupal\comment\Type;
 
 use Drupal\Core\Entity\Field\Type\IntegerItem;
 
 /**
  * The field item for the 'new' field.
  */
-class FieldNewItem extends IntegerItem {
+class CommentNewItem extends IntegerItem {
 
   /**
    * Definitions of the contained properties.
@@ -32,7 +32,7 @@ public function getPropertyDefinitions() {
       static::$propertyDefinitions['value'] = array(
         'type' => 'integer',
         'label' => t('Integer value'),
-        'class' => '\Drupal\comment\FieldNewValue',
+        'class' => '\Drupal\comment\CommentNewValue',
       );
     }
     return static::$propertyDefinitions;