diff --git a/modules/cart/commerce_cart.module b/modules/cart/commerce_cart.module
index dece2f2..ceae326 100644
--- a/modules/cart/commerce_cart.module
+++ b/modules/cart/commerce_cart.module
@@ -220,7 +220,7 @@ function commerce_cart_line_item_views_form_submit($form, &$form_state) {
  */
 function commerce_cart_line_item_delete_form_submit($form, &$form_state) {
   // Get which delete button has been clicked.
-  $line_item_id = substr($form_state['clicked_button']['#name'], strlen('delete-line-item-'));
+  $line_item_id = substr($form_state['triggering_element']['#name'], strlen('delete-line-item-'));
 
   // Get the corresponding wrapper to show the correct title.
   $line_item_wrapper = entity_metadata_wrapper('commerce_line_item', $form_state['line_items'][$line_item_id]);
diff --git a/modules/checkout/commerce_checkout.module b/modules/checkout/commerce_checkout.module
index 128186d..62edea7 100644
--- a/modules/checkout/commerce_checkout.module
+++ b/modules/checkout/commerce_checkout.module
@@ -215,7 +215,7 @@ function commerce_checkout_line_item_views_form_submit($form, &$form_state) {
   commerce_order_save($form_state['order']);
 
   // Redirect to the checkout page if specified.
-  if ($form_state['clicked_button']['#value'] == $form['actions']['checkout']['#value']) {
+  if ($form_state['triggering_element']['#value'] == $form['actions']['checkout']['#value']) {
     $form_state['redirect'] = 'checkout';
   }
 }
diff --git a/modules/customer/commerce_customer_ui.module b/modules/customer/commerce_customer_ui.module
index 59e8e06..a2b538f 100644
--- a/modules/customer/commerce_customer_ui.module
+++ b/modules/customer/commerce_customer_ui.module
@@ -313,7 +313,7 @@ function commerce_customer_ui_form_commerce_customer_ui_customer_profile_form_al
  */
 function commerce_customer_ui_customer_profile_form_submit($form, &$form_state) {
   // Set the redirect based on the button clicked.
-  if ($form_state['clicked_button']['#parents'][0] == 'save_continue') {
+  if ($form_state['triggering_element']['#parents'][0] == 'save_continue') {
     $form_state['redirect'] = 'admin/commerce/customer-profiles/add/' . strtr($form_state['customer_profile']->type, array('_' => '-'));
   }
   elseif (arg(2) == 'customer-profiles' && arg(3) == 'add') {
diff --git a/modules/line_item/commerce_line_item.module b/modules/line_item/commerce_line_item.module
index 3ea05e9..91fdc0e 100644
--- a/modules/line_item/commerce_line_item.module
+++ b/modules/line_item/commerce_line_item.module
@@ -1082,15 +1082,15 @@ function commerce_line_item_manager_validate($element, &$form_state, $form) {
 
   // If the "Add line item" button was clicked, store the line item type in the
   // $form_state for the rebuild of the $form array.
-  if (!empty($form_state['clicked_button'])) {
-    if ($form_state['clicked_button']['#value'] == t('Add line item')) {
+  if (!empty($form_state['triggering_element'])) {
+    if ($form_state['triggering_element']['#value'] == t('Add line item')) {
       $form_state['line_item_add'] = $element['actions']['line_item_type']['#value'];
       $form_state['rebuild'] = TRUE;
     }
     else {
       unset($form_state['line_item_add']);
 
-      $parent = array_pop($form_state['clicked_button']['#parents']);
+      $parent = array_pop($form_state['triggering_element']['#parents']);
 
       // If the save button was clicked from the line item type action form...
       if ($parent == 'save_line_item') {
diff --git a/modules/line_item/includes/views/handlers/commerce_line_item_handler_field_edit_delete.inc b/modules/line_item/includes/views/handlers/commerce_line_item_handler_field_edit_delete.inc
index cc7eddf..94419b1 100644
--- a/modules/line_item/includes/views/handlers/commerce_line_item_handler_field_edit_delete.inc
+++ b/modules/line_item/includes/views/handlers/commerce_line_item_handler_field_edit_delete.inc
@@ -37,7 +37,7 @@ class commerce_line_item_handler_field_edit_delete extends commerce_line_item_ha
 
     foreach (element_children($form['edit_delete']) as $line_item_id) {
       // Check for the removal of an item.
-      if ($form_state['clicked_button']['#name'] == 'delete-line-item-' . $line_item_id) {
+      if ($form_state['triggering_element']['#name'] == 'delete-line-item-' . $line_item_id) {
         // TODO: Remove this dependence on the Cart module API.
         commerce_cart_order_product_line_item_delete($order, $line_item_id);
       }
diff --git a/modules/order/commerce_order_ui.module b/modules/order/commerce_order_ui.module
index 2498cbe..ea9a1a0 100644
--- a/modules/order/commerce_order_ui.module
+++ b/modules/order/commerce_order_ui.module
@@ -216,7 +216,7 @@ function commerce_order_ui_form_commerce_order_ui_order_form_alter(&$form, &$for
  */
 function commerce_order_ui_order_form_submit($form, &$form_state) {
   // Apply the redirect based on the clicked button.
-  if ($form_state['clicked_button']['#value'] == t('Save order', array(), array('context' => 'a drupal commerce order'))) {
+  if ($form_state['triggering_element']['#value'] == t('Save order', array(), array('context' => 'a drupal commerce order'))) {
     drupal_set_message(t('Order saved.'));
 
     $form_state['redirect'] = 'admin/commerce/orders/' . $form_state['commerce_order']->order_id . '/edit';
diff --git a/modules/product/commerce_product_ui.module b/modules/product/commerce_product_ui.module
index 2716398..cf37da3 100644
--- a/modules/product/commerce_product_ui.module
+++ b/modules/product/commerce_product_ui.module
@@ -517,7 +517,7 @@ function commerce_product_ui_form_commerce_product_ui_product_form_alter(&$form,
  */
 function commerce_product_ui_product_form_submit($form, &$form_state) {
   // Set the redirect based on the button clicked.
-  if ($form_state['clicked_button']['#parents'][0] == 'save_continue') {
+  if ($form_state['triggering_element']['#parents'][0] == 'save_continue') {
     $form_state['redirect'] = 'admin/commerce/products/add/' . strtr($form_state['commerce_product']->type, array('_' => '-'));
   }
   elseif (arg(2) == 'products' && arg(3) == 'add') {
diff --git a/modules/product/includes/commerce_product_ui.forms.inc b/modules/product/includes/commerce_product_ui.forms.inc
index ecc7525..0535bfc 100644
--- a/modules/product/includes/commerce_product_ui.forms.inc
+++ b/modules/product/includes/commerce_product_ui.forms.inc
@@ -165,7 +165,7 @@ function commerce_product_ui_product_type_form_submit($form, &$form_state) {
   // Redirect based on the button clicked.
   drupal_set_message(t('Product type saved.'));
 
-  if ($form_state['clicked_button']['#parents'][0] == 'save_continue') {
+  if ($form_state['triggering_element']['#parents'][0] == 'save_continue') {
     $form_state['redirect'] = 'admin/commerce/products/types/' . strtr($product_type['type'], '_', '-') . '/fields';
   }
   else {