diff --git a/core/modules/comment/lib/Drupal/comment/CommentFieldName.php b/core/modules/comment/lib/Drupal/comment/CommentFieldNameItem.php
similarity index 88%
rename from core/modules/comment/lib/Drupal/comment/CommentFieldName.php
rename to core/modules/comment/lib/Drupal/comment/CommentFieldNameItem.php
index 7912fcc4f49..a90495d98be 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentFieldName.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentFieldNameItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\comment\CommentFieldName.
+ * Contains \Drupal\comment\CommentFieldNameItem.
  */
 
 namespace Drupal\comment;
@@ -13,7 +13,7 @@ use Drupal\Core\TypedData\DataDefinition;
 /**
  * The field item for the 'fieldname' field.
  */
-class CommentFieldName extends StringItem {
+class CommentFieldNameItem extends StringItem {
 
   /**
    * Definitions of the contained properties.
diff --git a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
index 9732c91e515..6e83ca1f1ae 100644
--- a/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Entity/Comment.php
@@ -442,7 +442,7 @@ class Comment extends ContentEntityBase implements CommentInterface {
       ->setComputed(TRUE);
 
     $item_definition = $fields['field_name']->getItemDefinition();
-    $item_definition->setClass('\Drupal\comment\CommentFieldName');
+    $item_definition->setClass('\Drupal\comment\CommentFieldNameItem');
     $fields['field_name']->setItemDefinition($item_definition);
 
     return $fields;
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php b/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php
index 7b2017bd59d..281f5382dee 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php
@@ -182,7 +182,7 @@ class Shortcut extends ContentEntityBase implements ShortcutInterface {
       ->setComputed(TRUE);
 
     $item_definition = $fields['path']->getItemDefinition();
-    $item_definition->setClass('\Drupal\shortcut\ShortcutPath');
+    $item_definition->setClass('\Drupal\shortcut\ShortcutPathItem');
     $fields['path']->setItemDefinition($item_definition);
 
     return $fields;
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutPath.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutPathItem.php
similarity index 89%
rename from core/modules/shortcut/lib/Drupal/shortcut/ShortcutPath.php
rename to core/modules/shortcut/lib/Drupal/shortcut/ShortcutPathItem.php
index 885d304f301..1010000400b 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutPath.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutPathItem.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\shortcut\ShortcutPath.
+ * Contains \Drupal\shortcut\ShortcutPathItem.
  */
 
 namespace Drupal\shortcut;
@@ -13,7 +13,7 @@ use Drupal\Core\TypedData\DataDefinition;
 /**
  * The field item for the 'path' field.
  */
-class ShortcutPath extends StringItem {
+class ShortcutPathItem extends StringItem {
 
   /**
    * Definitions of the contained properties.