diff --git a/core/modules/config/src/Tests/ConfigExportImportUITest.php b/core/modules/config/src/Tests/ConfigExportImportUITest.php
index 3139d1d..75e281b 100644
--- a/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php
@@ -106,7 +106,7 @@ public function testExportImport() {
     }
     $field_storages = entity_load_multiple('field_storage_config');
     foreach ($field_storages as $field_storage) {
-      if ($field_storage->field_name == $this->fieldName) {
+      if ($field_storage->getName() == $this->fieldName) {
         $field_storage->delete();
       }
     }
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index 92673fe..11df8aa 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -95,7 +95,7 @@ protected function setUp() {
    * Tests date field functionality.
    */
   function testDateField() {
-    $field_name = $this->fieldStorage->field_name;
+    $field_name = $this->fieldStorage->getName();
 
     // Display creation form.
     $this->drupalGet('entity_test/add');
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index 2144c04..04a59dc 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -64,7 +64,7 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
    *
    * @var string
    */
-  public $field_name;
+  protected $field_name;
 
   /**
    * The name of the entity type the field can be attached to.
@@ -392,7 +392,8 @@ public static function preDelete(EntityStorageInterface $storage, array $field_s
       if (!$field_storage->deleted) {
         foreach ($field_storage->getBundles() as $bundle) {
           $entity_type = $field_storage->getTargetEntityTypeId();
-          $field_ids[] = "{$entity_type}.$bundle.{$field_storage->field_name}";
+          $field_name = $field_storage->getName();
+          $field_ids[] = "{$entity_type}.$bundle.{$field_name}";
         }
       }
     }
diff --git a/core/modules/field/src/Tests/FieldCrudTest.php b/core/modules/field/src/Tests/FieldCrudTest.php
index 8806a53..1e1f805 100644
--- a/core/modules/field/src/Tests/FieldCrudTest.php
+++ b/core/modules/field/src/Tests/FieldCrudTest.php
@@ -191,9 +191,10 @@ function testDeleteFieldCrossDeletion() {
     $field_storage = $this->fieldStorage;
     entity_create('field_config', $this->fieldDefinition)->save();
     entity_create('field_config', $field_definition_2)->save();
+    $field_name = $field_storage->getName();
     $field_storage->delete();
-    $this->assertFalse(FieldConfig::loadByName('entity_test', $this->fieldDefinition['bundle'], $field_storage->field_name));
-    $this->assertFalse(FieldConfig::loadByName('entity_test', $field_definition_2['bundle'], $field_storage->field_name));
+    $this->assertFalse(FieldConfig::loadByName('entity_test', $this->fieldDefinition['bundle'], $field_name));
+    $this->assertFalse(FieldConfig::loadByName('entity_test', $field_definition_2['bundle'], $field_name));
 
     // Chack that deletion of the last field deletes the storage.
     $field_storage = entity_create('field_storage_config', $this->fieldStorageDefinition);
@@ -202,10 +203,11 @@ function testDeleteFieldCrossDeletion() {
     $field->save();
     $field_2 = entity_create('field_config', $field_definition_2);
     $field_2->save();
+    $field_name = $field_storage->getName();
     $field->delete();
-    $this->assertTrue(FieldStorageConfig::loadByName('entity_test', $field_storage->field_name));
+    $this->assertTrue(FieldStorageConfig::loadByName('entity_test', $field_name));
     $field_2->delete();
-    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->field_name));
+    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_name));
 
     // Check that deletion of all fields using a storage simultaneously deletes
     // the storage.
@@ -216,7 +218,7 @@ function testDeleteFieldCrossDeletion() {
     $field_2 = entity_create('field_config', $field_definition_2);
     $field_2->save();
     $this->container->get('entity.manager')->getStorage('field_config')->delete(array($field, $field_2));
-    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->field_name));
+    $this->assertFalse(FieldStorageConfig::loadByName('entity_test', $field_storage->getName()));
   }
 
 }
diff --git a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
index 6b30ff4..d0fe42f 100644
--- a/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
+++ b/core/modules/field_ui/src/FieldStorageConfigListBuilder.php
@@ -100,10 +100,10 @@ public function buildHeader() {
   public function buildRow(EntityInterface $field_storage) {
     if ($field_storage->isLocked()) {
       $row['class'] = array('menu-disabled');
-      $row['data']['id'] =  t('@field_name (Locked)', array('@field_name' => $field_storage->field_name));
+      $row['data']['id'] =  t('@field_name (Locked)', array('@field_name' => $field_storage->getName()));
     }
     else {
-      $row['data']['id'] = $field_storage->field_name;
+      $row['data']['id'] = $field_storage->getName();
     }
 
     $field_type = $this->fieldTypes[$field_storage->getType()];