diff --git a/core/modules/aggregator/aggregator.admin.inc b/core/modules/aggregator/aggregator.admin.inc
index 84643bb..9c29943 100644
--- a/core/modules/aggregator/aggregator.admin.inc
+++ b/core/modules/aggregator/aggregator.admin.inc
@@ -70,7 +70,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();
@@ -98,6 +98,7 @@ function aggregator_form_category_submit($form, &$form_state) {
     drupal_container()->get('plugin.manager.block')->clearCachedDefinitions();
   }
   if ($form_state['values']['op'] == t('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 5e1b190..25f625e 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -41,7 +41,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 d432b5b..694de87 100644
--- a/core/modules/dblog/dblog.admin.inc
+++ b/core/modules/dblog/dblog.admin.inc
@@ -347,11 +347,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')
     );
   }
@@ -364,7 +366,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.'));
   }
 }
@@ -375,17 +377,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 9ed3aa9..d9822fa 100644
--- a/core/modules/image/image.admin.inc
+++ b/core/modules/image/image.admin.inc
@@ -145,6 +145,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/node/content_types.inc b/core/modules/node/content_types.inc
index f8b144a..39751bc 100644
--- a/core/modules/node/content_types.inc
+++ b/core/modules/node/content_types.inc
@@ -266,6 +266,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => 'save',
     '#value' => t('Save content type'),
     '#weight' => 40,
   );
@@ -274,6 +275,7 @@ function node_type_form($form, &$form_state, $type = NULL) {
     if (!empty($type->type)) {
       $form['actions']['delete'] = array(
         '#type' => 'submit',
+        '#name' => 'delete',
         '#value' => t('Delete content type'),
         '#weight' => 45,
       );
@@ -333,7 +335,7 @@ function node_type_form_validate($form, &$form_state) {
  * @see node_type_form_validate()
  */
 function node_type_form_submit($form, &$form_state) {
-  $op = isset($form_state['values']['op']) ? $form_state['values']['op'] : '';
+  $op = isset($form_state['triggering_element']['#name']) ? $form_state['triggering_element']['#name'] : '';
 
   $type = node_type_set_defaults();
 
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index 139b2d2..77f9e25 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -220,11 +220,12 @@ function node_filter_form() {
   );
   $form['filters']['status']['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => count($session) ? 'refine' : 'filter',
     '#value' => count($session) ? t('Refine') : t('Filter'),
   );
   if (count($session)) {
-    $form['filters']['status']['actions']['undo'] = array('#type' => 'submit', '#value' => t('Undo'));
-    $form['filters']['status']['actions']['reset'] = array('#type' => 'submit', '#value' => t('Reset'));
+    $form['filters']['status']['actions']['undo'] = array('#type' => 'submit', '#name' => 'undo', '#value' => t('Undo'));
+    $form['filters']['status']['actions']['reset'] = array('#type' => 'submit', '#name' => 'reset', '#value' => t('Reset'));
   }
 
   $form['#attached']['library'][] = array('system', 'drupal.form');
@@ -245,9 +246,9 @@ function node_filter_form() {
  */
 function node_filter_form_submit($form, &$form_state) {
   $filters = node_filters();
-  switch ($form_state['values']['op']) {
-    case t('Filter'):
-    case t('Refine'):
+  switch ($form_state['triggering_element']['#name']) {
+    case 'filter':
+    case 'refine':
       // Apply every filter that has a choice selected other than 'any'.
       foreach ($filters as $filter => $options) {
         if (isset($form_state['values'][$filter]) && $form_state['values'][$filter] != '[any]') {
@@ -255,10 +256,10 @@ function node_filter_form_submit($form, &$form_state) {
         }
       }
       break;
-    case t('Undo'):
+    case 'undo':
       array_pop($_SESSION['node_overview_filter']);
       break;
-    case t('Reset'):
+    case 'reset':
       $_SESSION['node_overview_filter'] = array();
       break;
   }
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 0703071..98e5f5a 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -358,6 +358,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()));
@@ -382,7 +383,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);
diff --git a/core/modules/user/user.admin.inc b/core/modules/user/user.admin.inc
index 49986ba..e4fbf54 100644
--- a/core/modules/user/user.admin.inc
+++ b/core/modules/user/user.admin.inc
@@ -24,7 +24,6 @@ function user_admin($callback_arg = '') {
   $op = isset($_POST['op']) ? $_POST['op'] : $callback_arg;
 
   switch ($op) {
-    case t('Create new account'):
     case 'create':
       $account = entity_create('user', array());
       $build['user_register'] = entity_get_form($account, 'register');
@@ -101,15 +100,18 @@ function user_filter_form() {
   );
   $form['filters']['status']['actions']['submit'] = array(
     '#type' => 'submit',
+    '#name' => (count($session) ? 'refine' : 'filter'),
     '#value' => (count($session) ? t('Refine') : t('Filter')),
   );
   if (count($session)) {
     $form['filters']['status']['actions']['undo'] = array(
       '#type' => 'submit',
+      '#name' => 'undo',
       '#value' => t('Undo'),
     );
     $form['filters']['status']['actions']['reset'] = array(
       '#type' => 'submit',
+      '#name' => 'reset',
       '#value' => t('Reset'),
     );
   }
@@ -123,11 +125,11 @@ function user_filter_form() {
  * Process result from user administration filter form.
  */
 function user_filter_form_submit($form, &$form_state) {
-  $op = $form_state['values']['op'];
+  $op = $form_state['triggering_element']['#name'];
   $filters = user_filters();
   switch ($op) {
-    case t('Filter'):
-    case t('Refine'):
+    case 'filter':
+    case 'refine':
       // Apply every filter that has a choice selected other than 'any'.
       foreach ($filters as $filter => $options) {
         if (isset($form_state['values'][$filter]) && $form_state['values'][$filter] != '[any]') {
@@ -135,13 +137,13 @@ function user_filter_form_submit($form, &$form_state) {
         }
       }
       break;
-    case t('Undo'):
+    case 'undo':
       array_pop($_SESSION['user_overview_filter']);
       break;
-    case t('Reset'):
+    case 'reset':
       $_SESSION['user_overview_filter'] = array();
       break;
-    case t('Update'):
+    case 'update':
       return;
   }