diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 82406e02ad5ce6e4c425bf9e247e8e4ada7d20ea..ef568bce5d02d783df191593fca297c5f81b6ae8 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -1837,6 +1837,7 @@ usecase
 userid
 userinfo
 userref
+userreference
 userspace
 usuario
 uuid's
diff --git a/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml b/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml
index 3ed2dda7bb803f87290605979530de7d53c07dc1..be2bda62668be3412805b3ebb21d8b6ec655e1ec 100644
--- a/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml
+++ b/core/modules/config_translation/migrations/d6_field_instance_option_translation.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
 id: d6_field_instance_option_translation
 label: Field instance option configuration translation
 migration_tags:
diff --git a/core/modules/config_translation/migrations/d6_field_option_translation.yml b/core/modules/config_translation/migrations/d6_field_option_translation.yml
index cf68cf81eb5c21be83dbdf9078c4cf17f1576054..fcfabbeb7864b0c52eb2d17259c0a782612d0fbf 100644
--- a/core/modules/config_translation/migrations/d6_field_option_translation.yml
+++ b/core/modules/config_translation/migrations/d6_field_option_translation.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
 id: d6_field_option_translation
 label: Field option configuration translation
 migration_tags:
diff --git a/core/modules/field/migrations/d6_field.yml b/core/modules/field/migrations/d6_field.yml
index 09e3f66b134635f39c53d184e2a75dc7e9596115..99d016ccc8e80021818bef42778b88e5a2fa262e 100644
--- a/core/modules/field/migrations/d6_field.yml
+++ b/core/modules/field/migrations/d6_field.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
 id: d6_field
 label: Field configuration
 migration_tags:
diff --git a/core/modules/field/migrations/d6_field_formatter_settings.yml b/core/modules/field/migrations/d6_field_formatter_settings.yml
index 8413332c510669a5e2a9686d160f915a2f8eb08a..ba0620739f35e45effb949bfec924a7e108f5d50 100644
--- a/core/modules/field/migrations/d6_field_formatter_settings.yml
+++ b/core/modules/field/migrations/d6_field_formatter_settings.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagelink userreference
+# cspell:ignore imagelink
 id: d6_field_formatter_settings
 label: Field formatter configuration
 migration_tags:
diff --git a/core/modules/field/migrations/d6_field_instance_widget_settings.yml b/core/modules/field/migrations/d6_field_instance_widget_settings.yml
index 58b1e183eac591fb70ada322bccd342a768fac7e..815e8316b581aec4d2902e2b8eb9bc32df425082 100644
--- a/core/modules/field/migrations/d6_field_instance_widget_settings.yml
+++ b/core/modules/field/migrations/d6_field_instance_widget_settings.yml
@@ -1,4 +1,4 @@
-# cspell:ignore imagefield optionwidgets userreference
+# cspell:ignore imagefield optionwidgets
 id: d6_field_instance_widget_settings
 label: Field instance widget configuration
 migration_tags:
diff --git a/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php b/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
index ae6ecc03a7bfe312649fe2ccf4b5caea1436528c..e8cf7f5fa68719b3181655650926c6fd6511ccf5 100644
--- a/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
+++ b/core/modules/field/src/Plugin/migrate/process/d6/FieldSettings.php
@@ -6,8 +6,6 @@
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;
 
-// cspell:ignore userreference
-
 /**
  * Get the field settings.
  *
diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php
index f8b4392de35320e96ce49bc87dca0b5fec6a7b53..7445ae1ab28576d98c7f612b015f59388b9c0f6a 100644
--- a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php
+++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php
@@ -7,7 +7,7 @@
 use Drupal\migrate_drupal\Plugin\MigrateFieldPluginManager;
 use Drupal\Tests\migrate_drupal\Kernel\MigrateDrupalTestBase;
 
-// cspell:ignore imagefield optionwidgets userreference
+// cspell:ignore imagefield optionwidgets
 
 /**
  * Tests that modules exist for all source and destination plugins.
diff --git a/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml b/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
index 7b60790fb0efa277526603b9b76254c83c7deead..b3b85e268894e65f78735a114cd5eb07798ac892 100644
--- a/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
+++ b/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
@@ -1,7 +1,7 @@
 # The modules listed here do not have an migration. A status of finished is
 # assigned so that they appear in the will not be upgraded list on the Review
 # form.
-# cspell:ignore imageapi imagemagick userreference
+# cspell:ignore imageapi imagemagick
 finished:
   6:
     nodereference: core
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
index 1fb2d040895bce51937783398012f26a606db941..b389f8b0b13383b5553d3863a58e617a6d9a1e01 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/d6/UserReference.php
@@ -5,8 +5,6 @@
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate_drupal\Plugin\migrate\field\ReferenceBase;
 
-// cspell:ignore userreference
-
 /**
  * MigrateField Plugin for Drupal 6 user reference fields.
  *
diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
index f4af3d508d850b6b848a96b28ff7222f901fcb35..95496d446fa0b21b32924aeb599d2786c687c250 100644
--- a/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
+++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
@@ -7,7 +7,7 @@
 use Drupal\migrate_drupal\FieldDiscoveryInterface;
 use Drupal\Tests\migrate_drupal\Traits\FieldDiscoveryTestTrait;
 
-// cspell:ignore imagefield imagelink selectlist userreference
+// cspell:ignore imagefield imagelink selectlist
 
 /**
  * Tests FieldDiscovery service against Drupal 6.
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 009634308c20b4d5f285137f278326bb89deb729..96968b5e32b0bed7569a15e8763eb5dccc70cafa 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -337,8 +337,8 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
    * they must join either to the primary table or to a pre-existing
    * relationship.
    *
-   * An example of a relationship would be a nodereference table.
-   * If you have a nodereference named 'book_parent' which links to a
+   * An example of a relationship would be a node reference table.
+   * If you have a node reference named 'book_parent' which links to a
    * parent node, you could set up a relationship 'node_book_parent'
    * to 'node'. Then, anything that links to 'node' can link to
    * 'node_book_parent' instead, thus allowing all properties of
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index 950a06cfeb77d0cbc211670f78329734f9371f13..aaceda71ba705d639cb4742f112db42c99726538 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -595,8 +595,8 @@ function hook_field_views_data_alter(array &$data, \Drupal\field\FieldStorageCon
  * data. This allows a field type to add data that concerns its fields in
  * other tables, which would not yet be defined at the point when
  * hook_field_views_data() and hook_field_views_data_alter() are invoked. For
- * example, entityreference adds reverse relationships on the tables for the
- * entities which are referenced by entityreference fields.
+ * example, entity_reference adds reverse relationships on the tables for the
+ * entities which are referenced by entity_reference fields.
  *
  * (Note: this is weirdly named so as not to conflict with
  * hook_field_views_data_alter().)