diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentNonNodeTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentNonNodeTest.php
index e269aa5..562be17 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentNonNodeTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentNonNodeTest.php
@@ -363,7 +363,7 @@ function testCommentFunctionality() {
       'fields[_add_new_field][type]' => 'comment',
     );
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->drupalPostForm(NULL, array(), t('Save field settings'));
+    $this->drupalPostForm(NULL, array(), t('Save global field settings'));
     $this->drupalPostForm(NULL, array(), t('Save settings'));
     $this->assertRaw(t('Saved %name configuration', array('%name' => 'Foobar')));
 
diff --git a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
index 1c69c2e..2a49adf 100644
--- a/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/lib/Drupal/contact/Tests/ContactSitewideTest.php
@@ -245,7 +245,7 @@ function testSiteWideContact() {
     );
     $field_name = 'field_' . $edit['fields[_add_new_field][field_name]'];
     $this->drupalPostForm(NULL, $edit, t('Save'));
-    $this->drupalPostForm(NULL, array(), t('Save field settings'));
+    $this->drupalPostForm(NULL, array(), t('Save global field settings'));
     $this->drupalPostForm(NULL, array(), t('Save settings'));
 
     // Check that the field is displayed.
diff --git a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php
index acef71e..93ba079 100644
--- a/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php
+++ b/core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceAdminTest.php
@@ -76,7 +76,7 @@ public function testFieldAdminHandler() {
     $this->assertFieldByName('field[settings][target_type]', 'node');
 
     // Second step: 'Instance settings' form.
-    $this->drupalPostForm(NULL, array(), t('Save field settings'));
+    $this->drupalPostForm(NULL, array(), t('Save global field settings'));
 
     // The base handler should be selected by default.
     $this->assertFieldByName('instance[settings][handler]', 'default');
diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module
index 0d81232..030d983 100644
--- a/core/modules/field_ui/field_ui.module
+++ b/core/modules/field_ui/field_ui.module
@@ -91,7 +91,7 @@ function field_ui_menu() {
         'type' => MENU_DEFAULT_LOCAL_TASK,
       );
       $items["$path/fields/%/field"] = array(
-        'title' => 'Field settings',
+        'title' => 'Global settings',
         'type' => MENU_LOCAL_TASK,
         'route_name' => "field_ui.field_edit_$entity_type",
       );
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
index a2dbb68..0b471c1 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldOverview.php
@@ -134,7 +134,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
           '#type' => 'link',
           '#title' => $field_types[$field['type']]['label'],
           '#href' => $admin_field_path . '/field',
-          '#options' => array('attributes' => array('title' => $this->t('Edit field settings.'))),
+          '#options' => array('attributes' => array('title' => $this->t('Edit global field settings.'))),
         ),
       );
 
@@ -147,7 +147,7 @@ public function buildForm(array $form, array &$form_state, $entity_type = NULL,
       $links['field-settings'] = array(
         'title' => $this->t('Field settings'),
         'href' => $admin_field_path . '/field',
-        'attributes' => array('title' => $this->t('Edit field settings.')),
+        'attributes' => array('title' => $this->t('Edit global field settings.')),
       );
       $links['delete'] = array(
         'title' => $this->t('Delete'),
@@ -414,8 +414,8 @@ public function submitForm(array &$form, array &$form_state) {
           ->setComponent($values['field_name'])
           ->save();
 
-        // Always show the field settings step, as the cardinality needs to be
-        // configured for new fields.
+        // Always show the global field settings step, as the cardinality needs
+        // to be configured for new fields.
         $destinations[] = $this->adminPath. '/fields/' . $new_instance->id() . '/field';
         $destinations[] = $this->adminPath . '/fields/' . $new_instance->id();
 
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
index 67fa7d6..665c2b3 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Form/FieldEditForm.php
@@ -163,7 +163,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceInterfac
     $form['field']['settings'] += $entity->get($field['field_name'])->offsetGet(0)->settingsForm($form, $form_state, $field->hasData());
 
     $form['actions'] = array('#type' => 'actions');
-    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('Save field settings'));
+    $form['actions']['submit'] = array('#type' => 'submit', '#value' => $this->t('Save global field settings'));
     return $form;
   }
 
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
index 9116d09..aa9d6f9 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php
@@ -75,7 +75,7 @@ function fieldUIAddNewField($bundle_path, $initial_edit, $field_edit = array(),
     $this->assertRaw(t('These settings apply to the %label field everywhere it is used.', array('%label' => $label)), 'Field settings page was displayed.');
 
     // Second step : 'Field settings' form.
-    $this->drupalPostForm(NULL, $field_edit, t('Save field settings'));
+    $this->drupalPost(NULL, $field_edit, t('Save global field settings'));
     $this->assertRaw(t('Updated field %label field settings.', array('%label' => $label)), 'Redirected to instance and widget settings page.');
 
     // Third step : 'Instance settings' form.
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
index 79b1fbe..a464aca 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
@@ -132,7 +132,7 @@ function updateField() {
     $edit = array(
       'field[settings][test_field_setting]' => $string,
     );
-    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
+    $this->drupalPost(NULL, $edit, t('Save global field settings'));
 
     // Go to the field instance edit page.
     $this->drupalGet('admin/structure/types/manage/' . $this->type . '/fields/' . $instance_id);
@@ -183,7 +183,7 @@ function cardinalitySettings() {
       'field[cardinality]' => 'number',
       'field[cardinality_number]' => '',
     );
-    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->drupalPost($field_edit_path, $edit, t('Save global field settings'));
     $this->assertText('Number of values is required.');
 
     // Submit a custom number.
@@ -191,7 +191,7 @@ function cardinalitySettings() {
       'field[cardinality]' => 'number',
       'field[cardinality_number]' => 6,
     );
-    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->drupalPost($field_edit_path, $edit, t('Save global field settings'));
     $this->assertText('Updated field Body field settings.');
     $this->drupalGet($field_edit_path);
     $this->assertFieldByXPath("//select[@name='field[cardinality]']", 'number');
@@ -201,7 +201,7 @@ function cardinalitySettings() {
     $edit = array(
       'field[cardinality]' => FIELD_CARDINALITY_UNLIMITED,
     );
-    $this->drupalPostForm($field_edit_path, $edit, t('Save field settings'));
+    $this->drupalPost($field_edit_path, $edit, t('Save global field settings'));
     $this->assertText('Updated field Body field settings.');
     $this->drupalGet($field_edit_path);
     $this->assertFieldByXPath("//select[@name='field[cardinality]']", FIELD_CARDINALITY_UNLIMITED);
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
index d328bd5..e0ace0b 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
@@ -214,7 +214,7 @@ function testPrivateFileSetting() {
 
     // Change the field setting to make its files private, and upload a file.
     $edit = array('field[settings][uri_scheme]' => 'private');
-    $this->drupalPostForm("admin/structure/types/manage/$type_name/fields/$instance->id/field", $edit, t('Save field settings'));
+    $this->drupalPost("admin/structure/types/manage/$type_name/fields/$instance->id/field", $edit, t('Save global field settings'));
     $nid = $this->uploadNodeFile($test_file, $field_name, $type_name);
     $node = node_load($nid, TRUE);
     $node_file = file_load($node->{$field_name}->target_id);
@@ -259,8 +259,8 @@ function testPrivateFileComment() {
     );
     $this->drupalPostForm('admin/structure/comments/manage/node__comment/fields', $edit, t('Save'));
     $edit = array('field[settings][uri_scheme]' => 'private');
-    $this->drupalPostForm(NULL, $edit, t('Save field settings'));
-    $this->drupalPostForm(NULL, array(), t('Save settings'));
+    $this->drupalPost(NULL, $edit, t('Save global field settings'));
+    $this->drupalPost(NULL, array(), t('Save settings'));
 
     // Manually clear cache on the tester side.
     field_info_cache_clear();
diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php
index 5c27462..4f26725 100644
--- a/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php
+++ b/core/modules/image/lib/Drupal/image/Tests/ImageFieldDisplayTest.php
@@ -244,7 +244,7 @@ function testImageFieldDefaultImage() {
     $edit = array(
       'files[field_settings_default_image]' => drupal_realpath($images[0]->uri),
     );
-    $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/field", $edit, t('Save field settings'));
+    $this->drupalPost("admin/structure/types/manage/article/fields/node.article.$field_name/field", $edit, t('Save global field settings'));
     // Clear field info cache so the new default image is detected.
     field_info_cache_clear();
     $field = field_info_field('node', $field_name);
@@ -277,7 +277,7 @@ function testImageFieldDefaultImage() {
     $edit = array(
       'field[settings][default_image][fids]' => 0,
     );
-    $this->drupalPostForm("admin/structure/types/manage/article/fields/node.article.$field_name/field", $edit, t('Save field settings'));
+    $this->drupalPost("admin/structure/types/manage/article/fields/node.article.$field_name/field", $edit, t('Save global field settings'));
     // Clear field info cache so the new default image is detected.
     field_info_cache_clear();
     $field = field_info_field('node', $field_name);
@@ -290,7 +290,7 @@ function testImageFieldDefaultImage() {
     $edit = array(
       'files[field_settings_default_image]' => drupal_realpath($images[1]->uri),
     );
-    $this->drupalPostForm('admin/structure/types/manage/article/fields/node.article.' . $private_field_name . '/field', $edit, t('Save field settings'));
+    $this->drupalPost('admin/structure/types/manage/article/fields/node.article.' . $private_field_name . '/field', $edit, t('Save global field settings'));
     // Clear field info cache so the new default image is detected.
     field_info_cache_clear();
 
diff --git a/core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php b/core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php
index 97fda35..48a1e93 100644
--- a/core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php
+++ b/core/modules/link/lib/Drupal/link/Tests/LinkFieldUITest.php
@@ -54,7 +54,7 @@ function testFieldUI() {
     );
     $this->drupalPostForm("$type_path/fields", $edit, t('Save'));
     // Proceed to the Edit (field instance settings) page.
-    $this->drupalPostForm(NULL, array(), t('Save field settings'));
+    $this->drupalPostForm(NULL, array(), t('Save global field settings'));
     // Proceed to the Manage fields overview page.
     $this->drupalPostForm(NULL, array(), t('Save settings'));
 
diff --git a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
index fa54238..8559662 100644
--- a/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
+++ b/core/modules/options/lib/Drupal/options/Tests/OptionsFieldUITest.php
@@ -221,7 +221,7 @@ function testOptionsAllowedValuesBoolean() {
       'on' => $on,
       'off' => $off,
     );
-    $this->drupalPostForm($this->admin_path, $edit, t('Save field settings'));
+    $this->drupalPostForm($this->admin_path, $edit, t('Save global field settings'));
     $this->assertRaw(t('Updated field %label field settings.', array('%label' => $this->field_name)));
 
     // Clear field cache.
@@ -288,7 +288,7 @@ protected function createOptionsField($type) {
    */
   function assertAllowedValuesInput($input_string, $result, $message) {
     $edit = array('field[settings][allowed_values]' => $input_string);
-    $this->drupalPostForm($this->admin_path, $edit, t('Save field settings'));
+    $this->drupalPostForm($this->admin_path, $edit, t('Save global field settings'));
 
     if (is_string($result)) {
       $this->assertText($result, $message);
@@ -316,7 +316,7 @@ function testNodeDisplay() {
       'off' => $off,
     );
 
-    $this->drupalPostForm($this->admin_path, $edit, t('Save field settings'));
+    $this->drupalPostForm($this->admin_path, $edit, t('Save global field settings'));
     $this->assertText(format_string('Updated field !field_name field settings.', array('!field_name' => $this->field_name)), "The 'On' and 'Off' form fields work for boolean fields.");
 
     // Select a default value.