diff --git a/panopoly_magic.module b/panopoly_magic.module
index e565682..6a2fe31 100644
--- a/panopoly_magic.module
+++ b/panopoly_magic.module
@@ -237,7 +237,7 @@ function panopoly_magic_form_alter(&$form, &$form_state, $form_id) {
     // EXPERIEMENTAL: Handling Saving a Fieldable Panel Pane To Create a Live Preview. The trick
     // here is to make sure we properly save a version to get a vid, but don't make it the real one.
     // NOTE - I doubt this will be very good for performance. Let's call it RC1.
-    $clicked_button = empty($form_state['clicked_button']['#value']) ? '' : $form_state['clicked_button']['#value'];
+    $clicked_button = empty($form_state['triggering_element']['#value']) ? '' : $form_state['triggering_element']['#value'];
     if ($form_id == 'fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form' && ($clicked_button == 'Update Preview' || ($form_state['op'] == 'add' && empty($form_state['input']['form_build_id'])))) {
 
       // Determine the current VID for the element
@@ -535,7 +535,7 @@ function panopoly_magic_form_fieldable_panels_panes_fieldable_panels_pane_conten
   }
 
   // Add custom validation function for the reusable title
-  if (!empty($form_state['clicked_button']) && $form_state['clicked_button']['#value'] != 'Update Preview') {
+  if (!empty($form_state['triggering_element']) && $form_state['triggering_element']['#value'] != 'Update Preview') {
     $form['reusable']['admin_title']['#element_validate'][] = 'panopoly_magic_reusable_entity_validate';
   }
 
@@ -893,7 +893,7 @@ function panopoly_magic_form_ctools_entity_field_content_type_formatter_options_
   $form['#pre_render'][] = 'panopoly_magic_panelizer_pre_render';
 
   // When moving backwards through form steps, ensure image widgets properly retain their value.
-  if (!empty($form_state['field_instance']) && $form_state['clicked_button']['#value'] == 'Back') {
+  if (!empty($form_state['field_instance']) && $form_state['triggering_element']['#value'] == 'Back') {
     $field_name = $form_state['field_instance']['field_name'];
     $field_type = $form_state['field_instance']['widget']['module'];
     $entity = $form_state['entity'];
@@ -966,7 +966,7 @@ function panopoly_magic_form_ctools_entity_field_content_type_formatter_styles_a
  */
 function panopoly_magic_fape_submit(&$form, &$form_state) {
   // If there isn't a next step save the entity.
-  if ((empty($form_state['clicked_button']['#next']) || !empty($form_state['field']['body'])) && !empty($form_state['entity'])) {
+  if ((empty($form_state['triggering_element']['#next']) || !empty($form_state['field']['body'])) && !empty($form_state['entity'])) {
     entity_save($form_state['entity_type'], $form_state['entity']);
     $form_state['display_cache']->display->context['panelizer']->data = $form_state['entity'];
   }