diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index 0800960..d727dcc 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -34,9 +34,9 @@ function aggregator_form_category($form, &$form_state, $edit = NULL) {
     '#default_value' => isset($edit->description) ? $edit->description : '',
   );
   $form['actions'] = array('#type' => 'actions');
-  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save'));
+  $form['actions']['submit'] = array('#type' => 'submit', '#name' => 'save', '#value' => t('Save'));
   if (!empty($edit->cid)) {
-    $form['actions']['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
+    $form['actions']['delete'] = array('#type' => 'submit', '#name' => 'delete', '#value' => t('Delete'));
     $form['cid'] = array('#type' => 'hidden', '#value' => $edit->cid);
   }
 
@@ -49,7 +49,7 @@ function aggregator_form_category($form, &$form_state, $edit = NULL) {
  * @see aggregator_form_category_submit()
  */
 function aggregator_form_category_validate($form, &$form_state) {
-  if ($form_state['values']['op'] == t('Save')) {
+  if ($form_state['triggering_element']['#name'] == 'save') {
     // Check for duplicate titles
     if (isset($form_state['values']['cid'])) {
       $category = db_query("SELECT cid FROM {aggregator_category} WHERE title = :title AND cid <> :cid", array(':title' => $form_state['values']['title'], ':cid' => $form_state['values']['cid']))->fetchObject();
@@ -76,7 +76,7 @@ function aggregator_form_category_submit($form, &$form_state) {
   if (Drupal::moduleHandler()->moduleExists('block')) {
     Drupal::service('plugin.manager.block')->clearCachedDefinitions();
   }
-  if ($form_state['values']['op'] == t('Delete')) {
+  if ($form_state['triggering_element']['#name'] == 'delete') {
     $title = $form_state['values']['title'];
     // Unset the title.
     unset($form_state['values']['title']);
diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc
index 4998f83..003faef 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -42,7 +42,7 @@ function comment_reply(EntityInterface $node, $pid = NULL) {
   $build = array();
 
   // The user is previewing a comment prior to submitting it.
-  if ($op == t('Preview')) {
+  if ($op == 'preview') {
     if (user_access('post comments')) {
       $build['comment_form'] = comment_add($node, $pid);
     }
diff --git a/core/modules/dblog/dblog.admin.inc b/core/modules/dblog/dblog.admin.inc
index d3cc328..56192bf 100644
--- a/core/modules/dblog/dblog.admin.inc
+++ b/core/modules/dblog/dblog.admin.inc
@@ -255,11 +255,13 @@ function dblog_filter_form($form) {
   );
   $form['filters']['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => 'filter',
     '#value' => t('Filter'),
   );
   if (!empty($_SESSION['dblog_overview_filter'])) {
     $form['filters']['actions']['reset'] = array(
       '#type' => 'submit',
+      '#name' => 'reset',
       '#value' => t('Reset')
     );
   }
@@ -272,7 +274,7 @@ function dblog_filter_form($form) {
  * @see dblog_filter_form_submit()
  */
 function dblog_filter_form_validate($form, &$form_state) {
-  if ($form_state['values']['op'] == t('Filter') && empty($form_state['values']['type']) && empty($form_state['values']['severity'])) {
+  if ($form_state['triggering_element']['#name'] == 'filter' && empty($form_state['values']['type']) && empty($form_state['values']['severity'])) {
     form_set_error('type', t('You must select something to filter by.'));
   }
 }
@@ -283,17 +285,17 @@ function dblog_filter_form_validate($form, &$form_state) {
  * @see dblog_filter_form_validate()
  */
 function dblog_filter_form_submit($form, &$form_state) {
-  $op = $form_state['values']['op'];
+  $op = $form_state['triggering_element']['#name'];
   $filters = dblog_filters();
   switch ($op) {
-    case t('Filter'):
+    case 'filter':
       foreach ($filters as $name => $filter) {
         if (isset($form_state['values'][$name])) {
           $_SESSION['dblog_overview_filter'][$name] = $form_state['values'][$name];
         }
       }
       break;
-    case t('Reset'):
+    case 'reset':
       $_SESSION['dblog_overview_filter'] = array();
       break;
   }
diff --git a/core/modules/forum/forum.admin.inc b/core/modules/forum/forum.admin.inc
index 2a8a50d..16d8569 100644
--- a/core/modules/forum/forum.admin.inc
+++ b/core/modules/forum/forum.admin.inc
@@ -77,6 +77,7 @@ function forum_form_forum($form, &$form_state, Term $term) {
     $form['actions']['delete'] = array(
       '#type' => 'submit',
       '#value' => t('Delete'),
+      '#name' => 'delete',
       '#submit' => array('forum_forum_delete'),
     );
     $form['tid'] = array('#type' => 'value', '#value' => $term->id());
@@ -190,6 +191,7 @@ function forum_form_container($form, &$form_state, Term $term) {
     $form['actions']['delete'] = array(
       '#type' => 'submit',
       '#value' => t('Delete'),
+      '#name' => 'delete',
       '#submit' => array('forum_forum_delete'),
     );
     $form['tid'] = array('#type' => 'value', '#value' => $term->id());
diff --git a/core/modules/image/image.admin.inc b/core/modules/image/image.admin.inc
index 02af74e..bd90d4e 100644
--- a/core/modules/image/image.admin.inc
+++ b/core/modules/image/image.admin.inc
@@ -147,6 +147,7 @@ function image_style_form($form, &$form_state, $style) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => 'update',
     '#value' => t('Update style'),
   );
 
diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc
index 6326905..b2b4881 100644
--- a/core/modules/locale/locale.pages.inc
+++ b/core/modules/locale/locale.pages.inc
@@ -206,11 +206,13 @@ function locale_translate_filter_form($form, &$form_state) {
   );
   $form['filters']['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => 'filter',
     '#value' => t('Filter'),
   );
   if (!empty($_SESSION['locale_translate_filter'])) {
     $form['filters']['actions']['reset'] = array(
       '#type' => 'submit',
+      '#name' => 'reset',
       '#value' => t('Reset'),
     );
   }
@@ -222,10 +224,10 @@ function locale_translate_filter_form($form, &$form_state) {
  * Process result from locale translation filter form.
  */
 function locale_translate_filter_form_submit($form, &$form_state) {
-  $op = $form_state['values']['op'];
+  $op = $form_state['triggering_element']['#name'];
   $filters = locale_translate_filters();
   switch ($op) {
-    case t('Filter'):
+    case 'filter':
       foreach ($filters as $name => $filter) {
         if (isset($form_state['values'][$name])) {
           $_SESSION['locale_translate_filter'][$name] = $form_state['values'][$name];
@@ -233,7 +235,7 @@ function locale_translate_filter_form_submit($form, &$form_state) {
       }
       break;
 
-    case t('Reset'):
+    case 'reset':
       $_SESSION['locale_translate_filter'] = array();
       break;
 
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 7db05ef..4118309 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -276,6 +276,7 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
     );
     $form['actions']['reset_alphabetical'] = array(
       '#type' => 'submit',
+      '#name' => 'reset',
       '#value' => t('Reset to alphabetical')
     );
     $form_state['redirect'] = array(current_path(), (isset($_GET['page']) ? array('query' => array('page' => $_GET['page'])) : array()));
@@ -300,7 +301,7 @@ function taxonomy_overview_terms($form, &$form_state, Vocabulary $vocabulary) {
  * @see taxonomy_overview_terms()
  */
 function taxonomy_overview_terms_submit($form, &$form_state) {
-  if ($form_state['triggering_element']['#value'] == t('Reset to alphabetical')) {
+  if ($form_state['triggering_element']['#name'] == 'reset' || isset($form_state['confirm_reset_alphabetical'])) {
     // Execute the reset action.
     if ($form_state['values']['reset_alphabetical'] === TRUE) {
       return taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, $form_state);