diff --git a/core/modules/comment/src/Tests/CommentNonNodeTest.php b/core/modules/comment/src/Tests/CommentNonNodeTest.php
index 8d8e38b..bbafbc0 100644
--- a/core/modules/comment/src/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/src/Tests/CommentNonNodeTest.php
@@ -398,7 +398,7 @@ function testCommentFunctionality() {
       'default_value_input[comment][0][status]' => CommentItemInterface::CLOSED,
       'settings[anonymous]' => COMMENT_ANONYMOUS_MAY_CONTACT,
     );
-    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
     $this->drupalGet('entity_test/structure/entity_test/fields/entity_test.entity_test.comment');
     $this->assertNoFieldChecked('edit-default-value-input-comment-0-status-0');
     $this->assertFieldChecked('edit-default-value-input-comment-0-status-1');
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
index f1ddd4a..43d8ae8 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSettingsTest.php
@@ -175,7 +175,7 @@ function testSettingsUI() {
       // Test that also the Field UI form behaves correctly.
       $translatable = !$translatable;
       $edit = array('translatable' => $translatable);
-      $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.body', $edit, t('Save settings'));
+      $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.body', $edit, t('Save field settings'));
       \Drupal::entityManager()->clearCachedFieldDefinitions();
       $field = FieldConfig::loadByName('node', 'article', 'body');
       $definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'article');
diff --git a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
index 606b5b3..5422d4c 100644
--- a/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
+++ b/core/modules/content_translation/src/Tests/ContentTranslationSyncImageTest.php
@@ -94,7 +94,7 @@ function testImageFieldSync() {
       'third_party_settings[content_translation][translation_sync][alt]' => FALSE,
       'third_party_settings[content_translation][translation_sync][title]' => FALSE,
     );
-    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
 
     // Check that the content translation settings page reflects the changes
     // performed in the field edit page.
diff --git a/core/modules/datetime/src/Tests/DateTimeFieldTest.php b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
index 69f3725..127d52f 100644
--- a/core/modules/datetime/src/Tests/DateTimeFieldTest.php
+++ b/core/modules/datetime/src/Tests/DateTimeFieldTest.php
@@ -626,7 +626,7 @@ function testDefaultValue() {
     $field_edit = array(
       'default_value_input[default_date_type]' => 'now',
     );
-    $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save settings'));
+    $this->drupalPostForm('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name, $field_edit, t('Save field settings'));
 
     // Check that default value is selected in default value form.
     $this->drupalGet('admin/structure/types/manage/date_content/fields/node.date_content.' . $field_name);
diff --git a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
index 42afa5b..bcd01e6 100644
--- a/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
+++ b/core/modules/entity_reference/src/Tests/EntityReferenceAdminTest.php
@@ -127,7 +127,7 @@ public function testFieldAdminHandler() {
     $this->drupalPostForm(NULL, array(
       'required' => '1',
       'settings[handler_settings][target_bundles][' . key($bundles) . ']' => key($bundles),
-    ), t('Save settings'));
+    ), t('Save field settings'));
 
     // Check that the field appears in the overview form.
     $this->assertFieldByXPath('//table[@id="field-overview"]//tr[@id="field-test"]/td[1]', 'Test label', 'Field was created and appears in the overview page.');
@@ -136,7 +136,7 @@ public function testFieldAdminHandler() {
     // field is required.
     // The first 'Edit' link is for the Body field.
     $this->clickLink(t('Edit'), 1);
-    $this->drupalPostForm(NULL, array(), t('Save settings'));
+    $this->drupalPostForm(NULL, array(), t('Save field settings'));
 
     // Switch the target type to 'taxonomy_term' and check that the settings
     // specific to its selection handler are displayed.
@@ -174,7 +174,7 @@ public function testFieldAdminHandler() {
       '@create' => \Drupal::url('views_ui.add'),
       '@existing' => \Drupal::url('entity.view.collection'),
     )));
-    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
     // If no eligible view is available we should see a message.
     $this->assertText('The views entity selection mode requires a view.');
 
@@ -186,7 +186,7 @@ public function testFieldAdminHandler() {
     $edit = array(
       'settings[handler_settings][view][view_and_display]' => 'test_entity_reference:entity_reference_1',
     );
-    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
     $this->assertResponse(200);
 
     // Switch the target type to 'entity_test'.
@@ -203,7 +203,7 @@ public function testFieldAdminHandler() {
       'required' => FALSE,
       'settings[handler_settings][view][view_and_display]' => 'test_entity_reference_entity_test:entity_reference_1',
     );
-    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
     $this->assertResponse(200);
 
     // Create a new view and display it as a entity reference.
@@ -246,7 +246,7 @@ public function testFieldAdminHandler() {
       'required' => FALSE,
       'settings[handler_settings][view][view_and_display]' => 'node_test_view:entity_reference_1',
     );
-    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
 
     // Create nodes.
     $node1 = Node::create([
diff --git a/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php b/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
index 31f2c05..8bba0d0 100644
--- a/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
+++ b/core/modules/field/src/Tests/Boolean/BooleanFieldTest.php
@@ -122,7 +122,7 @@ function testBooleanField() {
     $edit = array(
       'settings[on_label]' => $on,
     );
-    $this->drupalPostForm('entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field_name, $edit, t('Save settings'));
+    $this->drupalPostForm('entity_test/structure/entity_test/fields/entity_test.entity_test.' . $field_name, $edit, t('Save field settings'));
     // Check if we see the updated labels in the creation form.
     $this->drupalGet('entity_test/add');
     $this->assertRaw($on);
diff --git a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
index e9b693d..e972013 100644
--- a/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
+++ b/core/modules/field/src/Tests/Boolean/BooleanFormatterSettingsTest.php
@@ -115,7 +115,7 @@ function testBooleanFormatterSettings() {
       $this->drupalPostForm(NULL, array(
         'settings[on_label]' => $values[0],
         'settings[off_label]' => $values[1],
-      ), 'Save settings');
+      ), 'Save field settings');
 
       // Open the Manage Display page and trigger the field settings form.
       $this->drupalGet('admin/structure/types/manage/' . $this->bundle . '/display');
diff --git a/core/modules/field/src/Tests/Number/NumberFieldTest.php b/core/modules/field/src/Tests/Number/NumberFieldTest.php
index e4f104e..6f1b5be 100644
--- a/core/modules/field/src/Tests/Number/NumberFieldTest.php
+++ b/core/modules/field/src/Tests/Number/NumberFieldTest.php
@@ -547,7 +547,7 @@ function assertSetMinimumValue($field, $minimum_value) {
     $edit = array(
       'settings[min]' => $minimum_value,
     );
-    $this->drupalPostForm($field_configuration_url, $edit, t('Save settings'));
+    $this->drupalPostForm($field_configuration_url, $edit, t('Save field settings'));
     // Check if an error message is shown.
     $this->assertNoRaw(t('%name is not a valid number.', array('%name' => t('Minimum'))), 'Saved ' . gettype($minimum_value) .'  value as minimal value on a ' . $field->getType() . ' field');
     // Check if a success message is shown.
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index b697f23..e63f229 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -158,11 +158,11 @@ function manageFieldsPage($type = '') {
 
     foreach ($operation_links as $link) {
       switch ($link['title']) {
-        case 'Edit field settings.':
+        case 'Field settings.':
           $this->assertIdentical($url, (string) $link['href']);
           $number_of_links_found++;
           break;
-        case 'Edit storage settings.':
+        case 'Storage settings.':
           $this->assertIdentical("$url/storage", (string) $link['href']);
           $number_of_links_found++;
           break;
@@ -266,7 +266,7 @@ function cardinalitySettings() {
     $this->assertFieldByXPath("//input[@name='cardinality_number']", 6);
 
     // Check that tabs displayed.
-    $this->assertLink(t('Edit'));
+    $this->assertLink(t('Field settings'));
     $this->assertLinkByHref('admin/structure/types/manage/article/fields/node.article.body');
     $this->assertLink(t('Field storage settings'));
     $this->assertLinkByHref($field_edit_path);
diff --git a/core/modules/file/src/Tests/FileFieldDisplayTest.php b/core/modules/file/src/Tests/FileFieldDisplayTest.php
index ffc2cf7..301c80c 100644
--- a/core/modules/file/src/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/src/Tests/FileFieldDisplayTest.php
@@ -156,7 +156,7 @@ function testDescToggle() {
     $edit = array(
       'settings[description_field]' => TRUE,
     );
-    $this->drupalPostForm(NULL, $edit, t('Save settings'));
+    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
     // Add a node of our new type and upload a file to it.
     $file = current($this->drupalGetTestFiles('text'));
     $title = $this->randomString();
diff --git a/core/modules/node/src/Tests/NodeAccessFieldTest.php b/core/modules/node/src/Tests/NodeAccessFieldTest.php
index ab490bb..f862e88 100644
--- a/core/modules/node/src/Tests/NodeAccessFieldTest.php
+++ b/core/modules/node/src/Tests/NodeAccessFieldTest.php
@@ -98,7 +98,7 @@ function testNodeAccessAdministerField() {
     $this->drupalPostForm(
       "admin/structure/types/manage/page/fields/node.page.{$this->fieldName}",
       $edit,
-      t('Save settings')
+      t('Save field settings')
     );
 
     // Log in as the administrator.