diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index 6415285..e4515e9 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -120,7 +120,7 @@ public function purgeFieldData(FieldDefinitionInterface $field_definition, $batc
    * Reads values to be purged for a single field.
    *
    * This method is called during field data purge, on fields for which
-   * onFieldDelete() or onFieldDelete() has previously run.
+   * onFieldDefinitionDelete() has previously run.
    *
    * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
    *   The field definition.
diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 05fc94b..9ff6e37 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -32,7 +32,7 @@
   public $id;
 
   /**
-   * The name of the field attached to the bundle by this field.
+   * The machine name of the field attached to the bundle.
    *
    * @var string
    */
diff --git a/core/lib/Drupal/Core/Field/FieldConfigStorageBase.php b/core/lib/Drupal/Core/Field/FieldConfigStorageBase.php
index 4023599..9fb25b4 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigStorageBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigStorageBase.php
@@ -39,7 +39,7 @@ protected function mapFromStorageRecords(array $records) {
   protected function mapToStorageRecord(EntityInterface $entity) {
     $record = parent::mapToStorageRecord($entity);
     $class = $this->fieldTypeManager->getPluginClass($record['field_type']);
-    $record['settings'] = $class::fieldSettingsFromConfigData($record['settings']);
+    $record['settings'] = $class::fieldSettingsToConfigData($record['settings']);
     return $record;
   }
 
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 29794c7..5f924b9 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -54,7 +54,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
   public $id;
 
   /**
-   * The field name.
+   * The machine name of the field attached to the bundle.
    *
    * This is the name of the property under which the field values are placed in
    * an entity: $entity->{$field_name}. The maximum length is