diff --git a/core/modules/comment/src/CommentStorageSchema.php b/core/modules/comment/src/CommentStorageSchema.php
index ee663c0..07e374f 100644
--- a/core/modules/comment/src/CommentStorageSchema.php
+++ b/core/modules/comment/src/CommentStorageSchema.php
@@ -18,12 +18,12 @@ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $res
     $schema = parent::getEntitySchema($entity_type, $reset);
 
     $schema['comment_field_data']['indexes'] += array(
-      'comment__status_pid' => array('pid', 'status'),
+      'comment__status_pid' => array('pid', 'status__value'),
       'comment__num_new' => array(
         'entity_id',
         'entity_type',
         'comment_type',
-        'status',
+        'status__value',
         'created',
         'cid',
         'thread',
diff --git a/core/modules/node/src/NodeStorageSchema.php b/core/modules/node/src/NodeStorageSchema.php
index 43bd465..61928ff 100644
--- a/core/modules/node/src/NodeStorageSchema.php
+++ b/core/modules/node/src/NodeStorageSchema.php
@@ -18,8 +18,8 @@ protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $res
     $schema = parent::getEntitySchema($entity_type, $reset);
 
     $schema['node_field_data']['indexes'] += array(
-      'node__frontpage' => array('promote', 'status', 'sticky', 'created'),
-      'node__status_type' => array('status', 'type', 'nid'),
+      'node__frontpage' => array('promote', 'status__value', 'sticky', 'created'),
+      'node__status_type' => array('status__value', 'type', 'nid'),
       'node__title_type' => array('title', array('type', 4)),
     );
 
@@ -48,7 +48,6 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st
     if ($table_name == 'node_field_data') {
       switch ($field_name) {
         case 'promote':
-        case 'status':
         case 'sticky':
         case 'title':
           // Improves the performance of the indexes defined