diff --git a/commerce_discount.info.inc b/commerce_discount.info.inc
index c33748d..74560a0 100644
--- a/commerce_discount.info.inc
+++ b/commerce_discount.info.inc
@@ -14,7 +14,7 @@ class CommerceDiscountMetadataController extends EntityDefaultMetadataController
     $info = parent::entityPropertyInfo();
     $properties = &$info[$this->type]['properties'];
 
-    $properties['enabled']['type'] = 'boolean';
+    $properties['status']['type'] = 'boolean';
 
     return $info;
   }
diff --git a/commerce_discount.install b/commerce_discount.install
index 3b07129..e7dbc3e 100644
--- a/commerce_discount.install
+++ b/commerce_discount.install
@@ -38,14 +38,14 @@ function commerce_discount_schema() {
         'description' => 'The discount type (bundle).',
         'default' => '',
       ),
-      'enabled' => array(
+      'status' => array(
         'type' => 'int',
         'not null' => TRUE,
-        'default' => TRUE,
+        'default' => 1,
         'size' => 'tiny',
         'description' => 'Whether the discount is enabled.',
       ),
-      'status' => array(
+      'export_status' => array(
         'type' => 'int',
         'not null' => TRUE,
         // Set the default to ENTITY_CUSTOM without using the constant as it is
@@ -385,3 +385,12 @@ function commerce_discount_update_7102() {
 function commerce_discount_update_7103() {
   commerce_line_item_configure_line_item_fields(array('commerce_discount'));
 }
+
+/**
+ * #1854108 Changes to commerce_discount schema.
+ */
+function commerce_discount_update_7104() {
+  // Rename "enabled" to "status" and "status" to "export_status".
+  db_change_field('commerce_discount', 'status', 'export_status', array('type' => 'int', 'not null' => TRUE, 'default' => 0x01, 'size' => 'tiny', 'description' => 'The exportable status of the entity.'));
+  db_change_field('commerce_discount', 'enabled', 'status', array('type' => 'int', 'not null' => TRUE, 'default' => 1, 'size' => 'tiny', 'description' => 'Whether the discount is active.'));
+}
diff --git a/commerce_discount.rules_defaults.inc b/commerce_discount.rules_defaults.inc
index 3cd68aa..68a573d 100644
--- a/commerce_discount.rules_defaults.inc
+++ b/commerce_discount.rules_defaults.inc
@@ -23,7 +23,7 @@ function commerce_discount_default_rules_configuration() {
       $rule = rules_reaction_rule();
 
       $rule->label = $discount->label;
-      $rule->active = $discount->enabled;
+      $rule->active = $discount->status;
 
       $type = $types[$discount->type];
       $wrapper = entity_metadata_wrapper('commerce_discount', $discount->name);
diff --git a/commerce_discount.test b/commerce_discount.test
index 8a28948..78f2410 100644
--- a/commerce_discount.test
+++ b/commerce_discount.test
@@ -102,8 +102,8 @@ class CommerceDiscountTestBase extends CommerceBaseTestCase {
       'name' => $name,
       'label' => $name,
       'type' => $discount_type,
-      'enabled' => TRUE,
       'status' => TRUE,
+      'export_status' => TRUE,
     );
     $commerce_discount = entity_create('commerce_discount', $values);
     $wrapper = entity_metadata_wrapper('commerce_discount', $commerce_discount);
@@ -177,7 +177,7 @@ class CommerceDiscountTest extends CommerceDiscountTestBase {
     $this->assertFieldByName('label', NULL, t('Label field is present'));
     $this->assertFieldByName('commerce_discount_fields[commerce_discount_offer][und][form][type]', NULL, t('Offer type field is present'));
     $this->assertFieldByName('commerce_discount_fields[commerce_discount_offer][und][form][commerce_fixed_amount][und][0][amount]', NULL, t('Amount field is present'));
-    $this->assertFieldByName('enabled', NULL, t('Status field is present'));
+    $this->assertFieldByName('status', NULL, t('Status field is present'));
     $this->assertFieldById('edit-submit', t('Save discount'), t('Save discount button is present'));
 
     // Try to save the product and check validation messages.
@@ -204,7 +204,7 @@ class CommerceDiscountTest extends CommerceDiscountTestBase {
     // Check the stored discount.
     $this->assertTrue($discount->label == $values['label'], t('Label stored correctly.'));
     $this->assertTrue($discount->name == 'discount_' . $values['name'], t('Name stored correctly.'));
-    $this->assertTrue($discount->enabled == 1, t('Enabled stored correctly.'));
+    $this->assertTrue($discount->status == 1, t('Active stored correctly.'));
 
     $this->assertTrue($wrapper->commerce_discount_offer->type->value() == 'fixed_amount', t('Offer type stored correctly.'));
     $this->assertTrue($wrapper->commerce_discount_offer->commerce_fixed_amount->amount->value() == 1277, t('Amount stored correctly.'));
@@ -229,7 +229,7 @@ class CommerceDiscountTest extends CommerceDiscountTestBase {
   "name" : "pf",
   "label" : "PF",
   "type" : "product_discount",
-  "enabled" : "1",
+  "status" : "1",
   "commerce_discount_offer" : {
     "type" : "fixed_amount",
     "commerce_fixed_amount" : { "und" : [
@@ -270,7 +270,7 @@ class CommerceDiscountTest extends CommerceDiscountTestBase {
     $this->assertTrue($wrapper->commerce_order_total->amount->value() == 700, t('Fixed order discount is deducted correctly.'));
 
     // Disable the discount.
-    $discount->enabled = FALSE;
+    $discount->status = FALSE;
     entity_save('commerce_discount', $discount);
 
     // Resave the order.
@@ -295,7 +295,7 @@ class CommerceDiscountTest extends CommerceDiscountTestBase {
     $this->assertTrue($wrapper->commerce_order_total->amount->value() == 950, t('Percentage order discount is deducted correctly.'));
 
     // Disable the discount.
-    $discount->enabled = FALSE;
+    $discount->status = FALSE;
     entity_save('commerce_discount', $discount);
 
     // Resave the order.
diff --git a/includes/commerce_discount.admin.inc b/includes/commerce_discount.admin.inc
index 235ef1f..cc3efea 100644
--- a/includes/commerce_discount.admin.inc
+++ b/includes/commerce_discount.admin.inc
@@ -159,15 +159,15 @@ function commerce_discount_form($form, &$form_state, CommerceDiscount $commerce_
     '#field_suffix' => '</span>&lrm;',
   );
 
-  $form['enabled'] = array(
+  $form['status'] = array(
     '#title' => t('Discount status'),
     '#type' => 'select',
     '#options' => array(
-      TRUE => t('Enabled'),
+      TRUE => t('Active'),
       FALSE => t('Disabled'),
     ),
     '#required' => FALSE,
-    '#default_value' => $commerce_discount->enabled,
+    '#default_value' => $commerce_discount->status,
   );
 
   // Show a list of commerce discounts.
diff --git a/includes/commerce_discount.class.inc b/includes/commerce_discount.class.inc
index aa95133..c1a1351 100644
--- a/includes/commerce_discount.class.inc
+++ b/includes/commerce_discount.class.inc
@@ -27,11 +27,11 @@ class CommerceDiscount extends Entity {
   public $type = 'order_discount';
 
   /**
-   * Whether the discount is enabled.
+   * Whether the discount is active.
    *
    * @var bool
    */
-  public $enabled = TRUE;
+  public $status = TRUE;
 
   /**
    * Set the component price title shown for customers.
diff --git a/includes/views/commerce_discount.views.inc b/includes/views/commerce_discount.views.inc
index 8bd1865..5fd510f 100644
--- a/includes/views/commerce_discount.views.inc
+++ b/includes/views/commerce_discount.views.inc
@@ -16,6 +16,27 @@ class CommerceDiscountViewsController extends EntityDefaultViewsController {
   public function views_data() {
     $data = parent::views_data();
 
+  // Expose the product status.
+  $data['commerce_discount']['status'] = array(
+    'title' => t('Status'),
+    'help' => t('Whether or not the discount is active.'),
+    'field' => array(
+      'handler' => 'views_handler_field_boolean',
+      'click sortable' => TRUE,
+      'output formats' => array(
+        'active-disabled' => array(t('Active'), t('Disabled')),
+      ),
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_boolean_operator',
+      'label' => t('Active'),
+      'type' => 'yes-no',
+    ),
+    'sort' => array(
+      'handler' => 'views_handler_sort',
+    ),
+  );
+
     // Show the operations using CTools dropbutton menu.
     $data['commerce_discount']['operations_dropbutton'] = array(
       'title' => t('Operations'),
diff --git a/includes/views/commerce_discount.views_default.inc b/includes/views/commerce_discount.views_default.inc
index d117808..d38a2a1 100644
--- a/includes/views/commerce_discount.views_default.inc
+++ b/includes/views/commerce_discount.views_default.inc
@@ -34,9 +34,10 @@ function commerce_discount_views_default_views() {
   $handler->display->display_options['pager']['type'] = 'full';
   $handler->display->display_options['style_plugin'] = 'table';
   $handler->display->display_options['style_options']['columns'] = array(
-    'commerce_discount_offer' => 'commerce_discount_offer',
+    'label' => 'label',
+    'type_1' => 'type_1',
     'type' => 'type',
-    'enabled' => 'enabled',
+    'status' => 'status',
     'commerce_discount_date' => 'commerce_discount_date',
     'commerce_discount_date_1' => 'commerce_discount_date_1',
     'operations_dropbutton' => 'operations_dropbutton',
@@ -69,9 +70,9 @@ function commerce_discount_views_default_views() {
       'separator' => '',
       'empty_column' => 0,
     ),
-    'enabled' => array(
+    'status' => array(
       'sortable' => 1,
-      'default_sort_order' => 'asc',
+      'default_sort_order' => 'desc',
       'align' => '',
       'separator' => '',
       'empty_column' => 0,
@@ -125,13 +126,12 @@ function commerce_discount_views_default_views() {
   $handler->display->display_options['fields']['type']['field'] = 'type';
   $handler->display->display_options['fields']['type']['alter']['alter_text'] = TRUE;
   $handler->display->display_options['fields']['type']['alter']['text'] = '<span>[type]</span>';
-  /* Field: Commerce Discount: Enabled */
-  $handler->display->display_options['fields']['enabled']['id'] = 'enabled';
-  $handler->display->display_options['fields']['enabled']['table'] = 'commerce_discount';
-  $handler->display->display_options['fields']['enabled']['field'] = 'enabled';
-  $handler->display->display_options['fields']['enabled']['label'] = 'Status';
-  $handler->display->display_options['fields']['enabled']['type'] = 'enabled-disabled';
-  $handler->display->display_options['fields']['enabled']['not'] = 0;
+  /* Field: Commerce Discount: Status */
+  $handler->display->display_options['fields']['status']['id'] = 'status';
+  $handler->display->display_options['fields']['status']['table'] = 'commerce_discount';
+  $handler->display->display_options['fields']['status']['field'] = 'status';
+  $handler->display->display_options['fields']['status']['type'] = 'active-disabled';
+  $handler->display->display_options['fields']['status']['not'] = 0;
   /* Field: Commerce Discount: Discount dates */
   $handler->display->display_options['fields']['commerce_discount_date']['id'] = 'commerce_discount_date';
   $handler->display->display_options['fields']['commerce_discount_date']['table'] = 'field_data_commerce_discount_date';
@@ -160,10 +160,17 @@ function commerce_discount_views_default_views() {
   $handler->display->display_options['fields']['operations_dropbutton']['id'] = 'operations_dropbutton';
   $handler->display->display_options['fields']['operations_dropbutton']['table'] = 'commerce_discount';
   $handler->display->display_options['fields']['operations_dropbutton']['field'] = 'operations_dropbutton';
-  /* Field: Commerce Discount: Operations */
-  $handler->display->display_options['fields']['operations_dropbutton']['id'] = 'operations_dropbutton';
-  $handler->display->display_options['fields']['operations_dropbutton']['table'] = 'commerce_discount';
-  $handler->display->display_options['fields']['operations_dropbutton']['field'] = 'operations_dropbutton';
+  /* Filter criterion: Commerce Discount: Label */
+  $handler->display->display_options['filters']['label']['id'] = 'label';
+  $handler->display->display_options['filters']['label']['table'] = 'commerce_discount';
+  $handler->display->display_options['filters']['label']['field'] = 'label';
+  $handler->display->display_options['filters']['label']['operator'] = 'contains';
+  $handler->display->display_options['filters']['label']['group'] = 1;
+  $handler->display->display_options['filters']['label']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['label']['expose']['operator_id'] = 'label_op';
+  $handler->display->display_options['filters']['label']['expose']['label'] = 'Discount name';
+  $handler->display->display_options['filters']['label']['expose']['operator'] = 'label_op';
+  $handler->display->display_options['filters']['label']['expose']['identifier'] = 'label';
   /* Filter criterion: Commerce Discount Offer: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'commerce_discount_offer';
@@ -185,17 +192,16 @@ function commerce_discount_views_default_views() {
   $handler->display->display_options['filters']['type']['expose']['label'] = 'Type';
   $handler->display->display_options['filters']['type']['expose']['operator'] = 'type_op';
   $handler->display->display_options['filters']['type']['expose']['identifier'] = 'type';
-  /* Filter criterion: Commerce Discount: Enabled */
-  $handler->display->display_options['filters']['enabled']['id'] = 'enabled';
-  $handler->display->display_options['filters']['enabled']['table'] = 'commerce_discount';
-  $handler->display->display_options['filters']['enabled']['field'] = 'enabled';
-  $handler->display->display_options['filters']['enabled']['value'] = 'All';
-  $handler->display->display_options['filters']['enabled']['group'] = 1;
-  $handler->display->display_options['filters']['enabled']['exposed'] = TRUE;
-  $handler->display->display_options['filters']['enabled']['expose']['operator_id'] = '';
-  $handler->display->display_options['filters']['enabled']['expose']['label'] = 'Enabled';
-  $handler->display->display_options['filters']['enabled']['expose']['operator'] = 'enabled_op';
-  $handler->display->display_options['filters']['enabled']['expose']['identifier'] = 'enabled';
+  /* Filter criterion: Commerce Discount: Status */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'commerce_discount';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = 'All';
+  $handler->display->display_options['filters']['status']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
+  $handler->display->display_options['filters']['status']['expose']['label'] = 'Active';
+  $handler->display->display_options['filters']['status']['expose']['operator'] = 'status_op';
+  $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
   $views['commerce_discount_overview'] = $view;
 
   return $views;