diff --git a/availability_calendar.variable.inc b/availability_calendar.variable.inc
index d23c673..31e9259 100644
--- a/availability_calendar.variable.inc
+++ b/availability_calendar.variable.inc
@@ -139,6 +139,13 @@ function availability_calendar_variable_info() {
       array('@1stOr2nd' => t('first'), '%op' => t('From arrival to departure'))),
     'default' => t('Arrival date'),
   );
+  $variables['availability_calendar_views_op_from_to1_duration'] = array(
+    'type' => 'string',
+    'title' => t('@1stOr2nd date for the %op operator', array('@1stOr2nd' => t('Second'), '%op' => t('From arrival to departure'))),
+    'description' => t('Label to use for the @1stOr2nd date when exposing an availability search with an %op operator.',
+      array('@1stOr2nd' => t('second'), '%op' => t('From arrival to departure'))),
+    'default' => t('Duration'),
+  );
   $variables['availability_calendar_views_op_from_to1_to1'] = array(
     'type' => 'string',
     'title' => t('@1stOr2nd date for the %op operator', array('@1stOr2nd' => t('Second'), '%op' => t('From arrival to departure'))),
@@ -153,26 +160,33 @@ function availability_calendar_variable_info() {
       array('@1stOr2nd' => t('first'), '%op' => t('From begin during duration'))),
     'default' => t('Start date'),
   );
-  $variables['availability_calendar_views_op_from_duration_duration'] = array(
+  $variables['availability_calendar_views_op_from_duration_to'] = array(
     'type' => 'string',
-    'title' => t('Duration for the %op operator', array('@1stOr2nd' => t('Second'), '%op' => t('From begin during duration'))),
-    'description' => t('Label to use for the duration when exposing an availability search with an %op operator.',
+    'title' => t('@1stOr2nd date for the %op operator', array('@1stOr2nd' => t('Second'), '%op' => t('From begin during duration'))),
+    'description' => t('Label to use for the @1stOr2nd date when exposing an availability search with an %op operator.',
       array('@1stOr2nd' => t('second'), '%op' => t('From begin during duration'))),
-    'default' => t('Duration'),
+    'default' => t('End date'),
   );
-
-  // Date range picker
-  $variables['availability_calendar_date_range_picker_done'] = array(
+  $variables['availability_calendar_views_op_from_duration_to1_to'] = array(
     'type' => 'string',
-    'title' => t('Done'),
-    'description' => t('Button used on the date range picker to dismiss it.'),
-    'default' => t('Done'),
+    'title' => t('@1stOr2nd date for the %op operator', array('@1stOr2nd' => t('Second'), '%op' => t('From begin during duration'))),
+    'description' => t('Label to use for the @1stOr2nd date when exposing an availability search with an %op operator.',
+      array('@1stOr2nd' => t('second'), '%op' => t('From begin during duration'))),
+    'default' => t('End date'),
   );
-  $variables['availability_calendar_date_range_picker_clear'] = array(
+  $variables['availability_calendar_views_op_from_duration_to1'] = array(
     'type' => 'string',
-    'title' => t('Clear selected date(s)'),
-    'description' => t('Button used on the date range picker to clear a selected date range.'),
-    'default' => t('Clear selected date(s)'),
+    'title' => t('@1stOr2nd date for the %op operator', array('@1stOr2nd' => t('Second'), '%op' => t('From arrival to departure'))),
+    'description' => t('Label to use for the @1stOr2nd date when exposing an availability search with an %op operator.',
+      array('@1stOr2nd' => t('second'), '%op' => t('From arrival to departure'))),
+    'default' => t('Departure'),
+  );
+  $variables['availability_calendar_views_op_from_duration_duration'] = array(
+    'type' => 'string',
+    'title' => t('Duration for the %op operator', array('@1stOr2nd' => t('Second'), '%op' => t('From begin during duration'))),
+    'description' => t('Label to use for the duration when exposing an availability search with an %op operator.',
+      array('@1stOr2nd' => t('second'), '%op' => t('From begin during duration'))),
+    'default' => t('Duration'),
   );
 
   foreach ($variables as &$variable) {