diff --git a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
index 89ef413125..6872a1bd1e 100644
--- a/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
@@ -33,10 +33,10 @@
  * in state allows to avoid this and ensures that the various steps of the
  * update process are predictable and repeatable.
  *
- * @see \Drupal\Core\Entity\EntityManagerInterface::getDefinition()
- * @see \Drupal\Core\Entity\EntityManagerInterface::getLastInstalledDefinition()
- * @see \Drupal\Core\Entity\EntityManagerInterface::getFieldStorageDefinitions()
- * @see \Drupal\Core\Entity\EntityManagerInterface::getLastInstalledFieldStorageDefinitions()
+ * @see \Drupal\Core\Entity\EntityTypeManagerInterface::getDefinition()
+ * @see \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface::getLastInstalledDefinition()
+ * @see \Drupal\Core\Entity\EntityFieldManagerInterface::getFieldStorageDefinitions()
+ * @see \Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface::getLastInstalledFieldStorageDefinitions()
  * @see hook_update_N()
  */
 interface EntityDefinitionUpdateManagerInterface {
diff --git a/core/lib/Drupal/Core/Entity/EntityFieldManager.php b/core/lib/Drupal/Core/Entity/EntityFieldManager.php
index cad945cddf..0e6774b768 100644
--- a/core/lib/Drupal/Core/Entity/EntityFieldManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityFieldManager.php
@@ -482,12 +482,13 @@ public function getFieldMap() {
 
         // In the second step, the per-bundle fields are added, based on the
         // persistent bundle field map stored in a key value collection. This
-        // data is managed in the EntityManager::onFieldDefinitionCreate()
-        // and EntityManager::onFieldDefinitionDelete() methods. Rebuilding this
-        // information in the same way as base fields would not scale, as the
-        // time to query would grow exponentially with more fields and bundles.
-        // A cache would be deleted during cache clears, which is the only time
-        // it is needed, so a key value collection is used.
+        // data is managed in the
+        // FieldDefinitionListener::onFieldDefinitionCreate() and
+        // FieldDefinitionListener::onFieldDefinitionDelete() methods.
+        // Rebuilding this information in the same way as base fields would not
+        // scale, as the time to query would grow exponentially with more fields
+        // and bundles. A cache would be deleted during cache clears, which is
+        // the only time it is needed, so a key value collection is used.
         $bundle_field_maps = $this->keyValueFactory->get('entity.definitions.bundle_field_map')->getAll();
         foreach ($bundle_field_maps as $entity_type_id => $bundle_field_map) {
           foreach ($bundle_field_map as $field_name => $map_entry) {
diff --git a/core/modules/comment/src/CommentManagerInterface.php b/core/modules/comment/src/CommentManagerInterface.php
index bb286bf70b..1cbac6692b 100644
--- a/core/modules/comment/src/CommentManagerInterface.php
+++ b/core/modules/comment/src/CommentManagerInterface.php
@@ -31,8 +31,6 @@
    *   - type: The field type.
    *   - bundles: The bundles in which the field appears, as an array with entity
    *     types as keys and the array of bundle names as values.
-   *
-   * @see \Drupal\Core\Entity\EntityManagerInterface::getFieldMap()
    */
   public function getFields($entity_type_id);