diff --git a/includes/common.inc b/includes/common.inc
index ab2faa2..fdb2356 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -29,7 +29,7 @@ function panelizer_settings_form($form, &$form_state) {
       '#type' => 'checkbox',
       '#default_value' => $panelizer->no_blocks,
       '#title' => t('Disable Drupal blocks/regions'),
-      '#description' => t('Check this to have the panel disable sidebars displayed in the theme. Note that some themes support this setting better than others. If in doubt, try with stock themes to see.'),
+      '#description' => t("Check this to have the display not show the theme's sidebars. Note that some themes support this setting better than others. If in doubt, try with stock themes to see."),
     );
   }
 
@@ -80,7 +80,7 @@ function panelizer_settings_form($form, &$form_state) {
       '#size' => 35,
       '#default_value' => $panelizer->css_class,
       '#title' => t('CSS class'),
-      '#description' => t('The CSS class to apply to this panel. You may use context substitions here.'),
+      '#description' => t('The CSS class to apply to this display. You may use context substitions here.'),
     );
   }
   else {
@@ -98,13 +98,13 @@ function panelizer_settings_form($form, &$form_state) {
     '#size' => 35,
     '#default_value' => $panelizer->css_id,
     '#title' => t('CSS ID'),
-    '#description' => t('The CSS ID to apply to this panel.'),
+    '#description' => t('The CSS ID to apply to this display.'),
   );
 
   $form['css'] = array(
     '#type' => 'textarea',
     '#title' => t('CSS code'),
-    '#description' => t('Enter well-formed CSS code here; this code will be embedded into the panel, and should only be used for minor adjustments; it is usually better to try to put CSS for the panel into the theme if possible. This CSS will be filtered for safety so some CSS may not work.'),
+    '#description' => t('Enter well-formed CSS code here; this code will be embedded into the display and should only be used for minor adjustments; it is usually better to try to put CSS for this display into the theme if possible. This CSS will be filtered for safety so some CSS may not work.'),
     '#default_value' => $panelizer->css,
   );
 
@@ -226,7 +226,7 @@ function panelizer_add_revision_info_form_submit(&$form, &$form_state) {
 }
 
 /**
- * Form to edit contexts that go with a panelizer panel.
+ * Form to edit contexts that go with a Panelizer display.
  */
 function panelizer_default_context_form($form, &$form_state) {
   ctools_include('context-admin');
@@ -296,7 +296,7 @@ function panelizer_default_context_form($form, &$form_state) {
 
 /**
  * Form used when an entity bundle is panelized but there is no default
- * panel. Entities are then individually panelized.
+ * display. Entities are then individually panelized.
  */
 function panelizer_panelize_entity_form($form, &$form_state) {
   $entity_type = $form_state['panelizer']->panelizer_type;
diff --git a/js/panelizer-vertical-tabs.js b/js/panelizer-vertical-tabs.js
index c98a4e1..f5dc95a 100644
--- a/js/panelizer-vertical-tabs.js
+++ b/js/panelizer-vertical-tabs.js
@@ -14,7 +14,7 @@ Drupal.behaviors.panelizerFieldsetSummary = {
       if (val === 0) {
         return Drupal.t('Not panelized');
       }
-      return Drupal.t('Use panel @name',
+      return Drupal.t('Use display @name',
         { '@name' : $('option[value="' + $('select', context).val() + '"]', context).html() });
     });
   }
diff --git a/panelizer.install b/panelizer.install
index 14eee6f..7c08165 100644
--- a/panelizer.install
+++ b/panelizer.install
@@ -592,3 +592,10 @@ function panelizer_update_7115() {
 
   drupal_set_message(t('Fixed @fixed Panelizer record(s) that were using the same display.', array('@fixed' => $fixed)));
 }
+
+/**
+ * Ensure there's one display for each revision.
+ */
+function panelizer_update_7116() {
+  drupal_set_message(t('Note: the "Panelizer" tabs on content, user, term pages, etc have been renamed to "Customize display".'))
+}
diff --git a/panelizer.module b/panelizer.module
index dfe8144..979a5a9 100644
--- a/panelizer.module
+++ b/panelizer.module
@@ -1160,7 +1160,7 @@ function panelizer_context_cache_clear($entity_type, $key) {
 /**
  * Implements hook_panels_cache_get().
  *
- * Get display edit cache for a panel being edited.
+ * Get display edit cache for a display being edited.
  *
  * The key is the second half of the key in this form:
  * panelizer:TYPE:KEY;
diff --git a/plugins/entity/PanelizerEntityDefault.class.php b/plugins/entity/PanelizerEntityDefault.class.php
index 2d29191..4a01f85 100644
--- a/plugins/entity/PanelizerEntityDefault.class.php
+++ b/plugins/entity/PanelizerEntityDefault.class.php
@@ -269,7 +269,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
               '%entity_name' => $entity_info['label'],
               '%bundle_name' => $entity_info['bundles'][$bundle]['label'],
             )),
-            'description' => t('Allows the user to choose which default panel the entity uses.'),
+            'description' => t('Allows the user to choose which default display the entity uses.'),
           );
           // Break out of loop after finding one we just need to see if we should
           // enable the permission.
@@ -804,7 +804,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
           ),
           '#required' => count($options),
           '#disabled' => count($options) == 0,
-          '#description' => t('The default panel to be used for new %bundle records. If "Allow panel choice" is not enabled, the item selected will be used for any new %bundle record. All existing %bundle records will have to be manually updated to the new selection.', array('%bundle' => $bundle)),
+          '#description' => t('The default display to be used for new %bundle records. If "Allow panel choice" is not enabled, the item selected will be used for any new %bundle record. All existing %bundle records will have to be manually updated to the new selection.', array('%bundle' => $bundle)),
         );
 
         $form['panelizer']['view modes'][$view_mode]['default revert'] = array(
@@ -823,7 +823,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
 
       // Control whether the default can be selected.
       $form['panelizer']['view modes'][$view_mode]['choice'] = array(
-        '#title' => t('Allow panel choice'),
+        '#title' => t('Allow per-record display choice'),
         '#type' => 'checkbox',
         '#default_value' => !empty($settings['view modes'][$view_mode]['status']) && !empty($settings['view modes'][$view_mode]['choice']),
         '#id' => 'panelizer-' . $view_mode . '-choice',
@@ -833,7 +833,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
             '#panelizer-' . $view_mode . '-status' => array('checked' => TRUE),
           ),
         ),
-        '#description' => t("Allows multiple panels to be created for this view mode. Once created, a selector will be provided on the %bundle record's edit form allowing the display of this view mode to be chosen. Additionally, any customizations made will be based upon the selected display. Note: the selector will not be shown if there is only one display, instead the default will be automatically selected.", array('%bundle' => $bundle)),
+        '#description' => t("Allows multiple displays to be created for this view mode. Once created, a selector will be provided on the %bundle record's edit form allowing the display of this view mode to be chosen. Additionally, any customizations made will be based upon the selected display. Note: the selector will not be shown if there is only one display, instead the default will be automatically selected.", array('%bundle' => $bundle)),
       );
       if (!empty($bundle)) {
         $form['panelizer']['view modes'][$view_mode]['choice']['#description'] .= '<br />'
@@ -1508,7 +1508,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
       $panelizers = $this->get_default_panelizer_objects($view_bundle);
 
       // Ignore view modes that don't have a choice, have no displays defined,
-      // or already have their own custom panel set up.
+      // or already have their own custom display set up.
       if (!$this->has_panel_choice($view_bundle) || empty($panelizers) || !empty($entity->panelizer[$view_mode]->did)) {
         continue;
       }
@@ -1697,7 +1697,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
 
       // If there is an $op, this must actually be panelized in order to pass.
       // If there is no $op, then the settings page can provide us a "panelize
-      // it!" page even if there is no panel.
+      // it!" page even if there is no display.
       if ($op && $op != 'overview' && $op != 'settings' && $op != 'choice' && empty($entity->panelizer[$view_mode])) {
         return FALSE;
       }
@@ -2226,7 +2226,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
   }
 
   /**
-   * Determine if a bundle has a default panel.
+   * Determine if a bundle has a default display.
    *
    * @param $bundle
    *   A $bundle.$view_mode combo string. If no view mode is specified
@@ -2374,7 +2374,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
   }
 
   /**
-   * Load the named default panel for the bundle.
+   * Load the named default display for the bundle.
    */
   public function get_default_panelizer_object($bundle, $name) {
     if (strpos($bundle, '.') !== FALSE) {
@@ -2673,7 +2673,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
           '#suffix' => '</div>',
         );
 
-        // Panelize is enabled and a default panel will be provided
+        // Panelize is enabled and a default display will be provided.
         if (!empty($settings['status']) && !empty($settings['default']) && empty($settings['choice'])) {
           $links_array = array();
           foreach (panelizer_operations() as $path => $operation) {
@@ -2719,7 +2719,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
           ));
         }
         else {
-          $links = t('Save to access panel list');
+          $links = t('Save to access display list');
         }
 
         $form['entities'][$this->entity_type][$bundle][$view_mode]['links']['default2'] = array(
diff --git a/plugins/task_handlers/panelizer_node.inc b/plugins/task_handlers/panelizer_node.inc
index 679813f..e711d34 100644
--- a/plugins/task_handlers/panelizer_node.inc
+++ b/plugins/task_handlers/panelizer_node.inc
@@ -401,7 +401,7 @@ function panelizer_panelizer_task_edit_settings_submit($form, &$form_state) {
 }
 
 /**
- * Set up a title for the panel based upon the selection rules.
+ * Set up a title for the display based upon the selection rules.
  */
 function panelizer_panelizer_task_title($handler, $task, $subtask) {
   if (isset($handler->conf['title'])) {
diff --git a/plugins/views/panelizer_handler_panelizer_status.inc b/plugins/views/panelizer_handler_panelizer_status.inc
index bd54839..f431dd9 100644
--- a/plugins/views/panelizer_handler_panelizer_status.inc
+++ b/plugins/views/panelizer_handler_panelizer_status.inc
@@ -32,7 +32,7 @@ class panelizer_handler_panelizer_status extends views_handler_field_entity {
       '#type' => 'textfield',
       '#title' => t('Customized text'),
       '#default_value' => $this->options['custom'],
-      '#description' => t('Text to display if the entity has a custom panel.'),
+      '#description' => t('Text to display if the entity has a custom display.'),
     );
     $form['not_panelized'] = array(
       '#type' => 'textfield',