diff --git a/app/code/Magento/Bundle/etc/db_schema.xml b/app/code/Magento/Bundle/etc/db_schema.xml
index 8092f34c533fa..f1c1e7ae782dc 100644
--- a/app/code/Magento/Bundle/etc/db_schema.xml
+++ b/app/code/Magento/Bundle/etc/db_schema.xml
@@ -120,11 +120,11 @@
     <table name="catalog_product_bundle_price_index" resource="default" engine="innodb"
            comment="Catalog Product Bundle Price Index">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Website Id"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Customer Group Id"/>
+                comment="Customer Group ID"/>
         <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="false"
                 comment="Min Price"/>
         <column xsi:type="decimal" name="max_price" scale="4" precision="12" unsigned="false" nullable="false"
@@ -153,11 +153,11 @@
     <table name="catalog_product_bundle_stock_index" resource="default" engine="innodb"
            comment="Catalog Product Bundle Stock Index">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="smallint" name="stock_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Stock Id"/>
+                comment="Stock ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="smallint" name="stock_status" padding="6" unsigned="false" nullable="true" identity="false"
@@ -172,13 +172,13 @@
     <table name="catalog_product_index_price_bundle_idx" resource="default" engine="innodb"
            comment="Catalog Product Index Price Bundle Idx">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                default="0" comment="Tax Class Id"/>
+                default="0" comment="Tax Class ID"/>
         <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Price Type"/>
         <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -206,13 +206,13 @@
     <table name="catalog_product_index_price_bundle_tmp" resource="default" engine="memory"
            comment="Catalog Product Index Price Bundle Tmp">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="smallint" name="tax_class_id" padding="5" unsigned="true" nullable="true" identity="false"
-                default="0" comment="Tax Class Id"/>
+                default="0" comment="Tax Class ID"/>
         <column xsi:type="smallint" name="price_type" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Price Type"/>
         <column xsi:type="decimal" name="special_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -240,11 +240,11 @@
     <table name="catalog_product_index_price_bundle_sel_idx" resource="default" engine="innodb"
            comment="Catalog Product Index Price Bundle Sel Idx">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -268,11 +268,11 @@
     <table name="catalog_product_index_price_bundle_sel_tmp" resource="default" engine="memory"
            comment="Catalog Product Index Price Bundle Sel Tmp">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="int" name="selection_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -296,11 +296,11 @@
     <table name="catalog_product_index_price_bundle_opt_idx" resource="default" engine="innodb"
            comment="Catalog Product Index Price Bundle Opt Idx">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -323,11 +323,11 @@
     <table name="catalog_product_index_price_bundle_opt_tmp" resource="default" engine="memory"
            comment="Catalog Product Index Price Bundle Opt Tmp">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_group_id" padding="11" unsigned="false" nullable="false"
                 identity="false"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="int" name="option_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Option Id"/>
         <column xsi:type="decimal" name="min_price" scale="4" precision="12" unsigned="false" nullable="true"
diff --git a/app/code/Magento/Catalog/etc/db_schema.xml b/app/code/Magento/Catalog/etc/db_schema.xml
index 7b4e1a96adda0..860e5fee9f157 100644
--- a/app/code/Magento/Catalog/etc/db_schema.xml
+++ b/app/code/Magento/Catalog/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalog_product_entity" resource="default" engine="innodb" comment="Catalog Product Table">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
                 identity="false" default="0" comment="Attribute Set ID"/>
         <column xsi:type="varchar" name="type_id" nullable="false" length="32" default="simple" comment="Type ID"/>
@@ -41,7 +41,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -76,7 +76,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -112,7 +112,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -148,7 +148,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="text" name="value" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -183,7 +183,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -218,7 +218,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="int" name="position" padding="11" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Position"/>
         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
@@ -251,7 +251,7 @@
     </table>
     <table name="catalog_category_entity" resource="default" engine="innodb" comment="Catalog Category Table">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
                 identity="false" default="0" comment="Attribute Set ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -286,7 +286,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -324,7 +324,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -363,7 +363,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -402,7 +402,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="text" name="value" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -440,7 +440,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -738,7 +738,7 @@
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
                 comment="Value ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="smallint" name="all_groups" padding="5" unsigned="true" nullable="false" identity="false"
                 default="1" comment="Is Applicable To All Customer Groups"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -805,7 +805,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="label" nullable="true" length="255" comment="Label"/>
         <column xsi:type="int" name="position" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Position"/>
@@ -1651,7 +1651,8 @@
            comment="Link Media value to Product entity table">
         <column xsi:type="int" name="value_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Value media Entry ID"/>
-        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"/>
+        <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Product Entity ID"/>
         <constraint xsi:type="foreign" name="FK_A6C6C8FAA386736921D3A7C4B50B1185"
                     table="catalog_product_entity_media_gallery_value_to_entity" column="value_id"
                     referenceTable="catalog_product_entity_media_gallery" referenceColumn="value_id"
diff --git a/app/code/Magento/CatalogRule/etc/db_schema.xml b/app/code/Magento/CatalogRule/etc/db_schema.xml
index f4c40a6930cc0..25c9d866167ce 100644
--- a/app/code/Magento/CatalogRule/etc/db_schema.xml
+++ b/app/code/Magento/CatalogRule/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="catalogrule" resource="default" engine="innodb" comment="CatalogRule">
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="date" name="from_date" comment="From"/>
@@ -39,7 +39,7 @@
         <column xsi:type="int" name="rule_product_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Rule Product Id"/>
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-                comment="Rule Id"/>
+                comment="Rule ID"/>
         <column xsi:type="int" name="from_time" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="From Time"/>
         <column xsi:type="int" name="to_time" padding="10" unsigned="true" nullable="false" identity="false" default="0"
@@ -119,7 +119,7 @@
     </table>
     <table name="catalogrule_group_website" resource="default" engine="innodb" comment="CatalogRule Group Website">
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-                comment="Rule Id"/>
+                comment="Rule ID"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Customer Group Id"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
@@ -137,7 +137,8 @@
         </index>
     </table>
     <table name="catalogrule_website" resource="default" engine="innodb" comment="Catalog Rules To Websites Relations">
-        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Website Id"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -156,7 +157,8 @@
     </table>
     <table name="catalogrule_customer_group" resource="default" engine="innodb"
            comment="Catalog Rules To Customer Groups Relations">
-        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Customer Group Id"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -177,7 +179,7 @@
         <column xsi:type="int" name="rule_product_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Rule Product Id"/>
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-                comment="Rule Id"/>
+                comment="Rule ID"/>
         <column xsi:type="int" name="from_time" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="From Time"/>
         <column xsi:type="int" name="to_time" padding="10" unsigned="true" nullable="false" identity="false" default="0"
@@ -259,7 +261,7 @@
     <table name="catalogrule_group_website_replica" resource="default" engine="innodb"
            comment="CatalogRule Group Website">
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-                comment="Rule Id"/>
+                comment="Rule ID"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Customer Group Id"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
diff --git a/app/code/Magento/Cms/etc/db_schema.xml b/app/code/Magento/Cms/etc/db_schema.xml
index 2b825544f56f1..3f97a94d54943 100644
--- a/app/code/Magento/Cms/etc/db_schema.xml
+++ b/app/code/Magento/Cms/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="cms_block" resource="default" engine="innodb" comment="CMS Block Table">
         <column xsi:type="smallint" name="block_id" padding="6" unsigned="false" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="title" nullable="false" length="255" comment="Block Title"/>
         <column xsi:type="varchar" name="identifier" nullable="false" length="255" comment="Block String Identifier"/>
         <column xsi:type="mediumtext" name="content" nullable="true" comment="Block Content"/>
@@ -46,7 +46,7 @@
     </table>
     <table name="cms_page" resource="default" engine="innodb" comment="CMS Page Table">
         <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Page Title"/>
         <column xsi:type="varchar" name="page_layout" nullable="true" length="255" comment="Page Layout"/>
         <column xsi:type="text" name="meta_keywords" nullable="true" comment="Page Meta Keywords"/>
@@ -86,7 +86,8 @@
         </index>
     </table>
     <table name="cms_page_store" resource="default" engine="innodb" comment="CMS Page To Store Linkage Table">
-        <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="false"/>
+        <column xsi:type="smallint" name="page_id" padding="6" unsigned="false" nullable="false" identity="false"
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Store ID"/>
         <constraint xsi:type="primary" name="PRIMARY">
diff --git a/app/code/Magento/Customer/etc/db_schema.xml b/app/code/Magento/Customer/etc/db_schema.xml
index 368ca417432fd..657083b58e1b1 100644
--- a/app/code/Magento/Customer/etc/db_schema.xml
+++ b/app/code/Magento/Customer/etc/db_schema.xml
@@ -9,15 +9,15 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="customer_entity" resource="default" engine="innodb" comment="Customer Entity">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Website Id"/>
+                comment="Website ID"/>
         <column xsi:type="varchar" name="email" nullable="true" length="255" comment="Email"/>
         <column xsi:type="smallint" name="group_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Group Id"/>
+                default="0" comment="Group ID"/>
         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                default="0" comment="Store Id"/>
+                default="0" comment="Store ID"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
@@ -77,10 +77,10 @@
     </table>
     <table name="customer_address_entity" resource="default" engine="innodb" comment="Customer Address Entity">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="true" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="false" default="CURRENT_TIMESTAMP"
@@ -128,7 +128,7 @@
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Attribute Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -159,7 +159,7 @@
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Attribute Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -186,11 +186,11 @@
     </table>
     <table name="customer_address_entity_int" resource="default" engine="innodb" comment="Customer Address Entity Int">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -218,11 +218,11 @@
     <table name="customer_address_entity_text" resource="default" engine="innodb"
            comment="Customer Address Entity Text">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="text" name="value" nullable="false" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -244,11 +244,11 @@
     <table name="customer_address_entity_varchar" resource="default" engine="innodb"
            comment="Customer Address Entity Varchar">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -274,11 +274,11 @@
     </table>
     <table name="customer_entity_datetime" resource="default" engine="innodb" comment="Customer Entity Datetime">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -304,11 +304,11 @@
     </table>
     <table name="customer_entity_decimal" resource="default" engine="innodb" comment="Customer Entity Decimal">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -335,11 +335,11 @@
     </table>
     <table name="customer_entity_int" resource="default" engine="innodb" comment="Customer Entity Int">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
                 comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -366,11 +366,11 @@
     </table>
     <table name="customer_entity_text" resource="default" engine="innodb" comment="Customer Entity Text">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="text" name="value" nullable="false" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -391,11 +391,11 @@
     </table>
     <table name="customer_entity_varchar" resource="default" engine="innodb" comment="Customer Entity Varchar">
         <column xsi:type="int" name="value_id" padding="11" unsigned="false" nullable="false" identity="true"
-                comment="Value Id"/>
+                comment="Value ID"/>
         <column xsi:type="smallint" name="attribute_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Attribute Id"/>
+                default="0" comment="Attribute ID"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
diff --git a/app/code/Magento/Eav/etc/db_schema.xml b/app/code/Magento/Eav/etc/db_schema.xml
index f930321e5259b..e81fad5ebded8 100644
--- a/app/code/Magento/Eav/etc/db_schema.xml
+++ b/app/code/Magento/Eav/etc/db_schema.xml
@@ -15,7 +15,7 @@
         <column xsi:type="varchar" name="attribute_model" nullable="true" length="255" comment="Attribute Model"/>
         <column xsi:type="varchar" name="entity_table" nullable="true" length="255" comment="Entity Table"/>
         <column xsi:type="varchar" name="value_table_prefix" nullable="true" length="255" comment="Value Table Prefix"/>
-        <column xsi:type="varchar" name="entity_id_field" nullable="true" length="255" comment="Entity Id Field"/>
+        <column xsi:type="varchar" name="entity_id_field" nullable="true" length="255" comment="Entity ID Field"/>
         <column xsi:type="smallint" name="is_data_sharing" padding="5" unsigned="true" nullable="false" identity="false"
                 default="1" comment="Defines Is Data Sharing"/>
         <column xsi:type="varchar" name="data_sharing_key" nullable="true" length="100" default="default"
@@ -42,7 +42,7 @@
     </table>
     <table name="eav_entity" resource="default" engine="innodb" comment="Eav Entity">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="entity_type_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Entity Type Id"/>
         <column xsi:type="smallint" name="attribute_set_id" padding="5" unsigned="true" nullable="false"
@@ -83,7 +83,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="datetime" name="value" on_update="false" nullable="true" comment="Attribute Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -123,7 +123,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
                 comment="Attribute Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -164,7 +164,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="int" name="value" padding="11" unsigned="false" nullable="false" identity="false" default="0"
                 comment="Attribute Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -204,7 +204,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="text" name="value" nullable="false" comment="Attribute Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
@@ -241,7 +241,7 @@
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="value" nullable="true" length="255" comment="Attribute Value"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="value_id"/>
diff --git a/app/code/Magento/Integration/etc/db_schema.xml b/app/code/Magento/Integration/etc/db_schema.xml
index 9e81b867d36d5..33173df4f6c0b 100644
--- a/app/code/Magento/Integration/etc/db_schema.xml
+++ b/app/code/Magento/Integration/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="oauth_consumer" resource="default" engine="innodb" comment="OAuth Consumers">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
                 comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="true" nullable="true" default="0"
diff --git a/app/code/Magento/NewRelicReporting/etc/db_schema.xml b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
index 6f9ce29436f65..f6d463de0ce33 100644
--- a/app/code/Magento/NewRelicReporting/etc/db_schema.xml
+++ b/app/code/Magento/NewRelicReporting/etc/db_schema.xml
@@ -10,7 +10,7 @@
     <table name="reporting_counts" resource="default" engine="innodb"
            comment="Reporting for all count related events generated via the cron job">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Item Reported"/>
         <column xsi:type="int" name="count" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Count Value"/>
@@ -35,9 +35,9 @@
     </table>
     <table name="reporting_orders" resource="default" engine="innodb" comment="Reporting for all orders">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-                comment="Customer Id"/>
+                comment="Customer ID"/>
         <column xsi:type="decimal" name="total" scale="0" precision="10" unsigned="true" nullable="true"/>
         <column xsi:type="decimal" name="total_base" scale="0" precision="10" unsigned="true" nullable="true"/>
         <column xsi:type="int" name="item_count" padding="10" unsigned="true" nullable="false" identity="false"
@@ -50,7 +50,7 @@
     </table>
     <table name="reporting_users" resource="default" engine="innodb" comment="Reporting for user actions">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="User Type"/>
         <column xsi:type="varchar" name="action" nullable="true" length="255" comment="Action Performed"/>
         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
@@ -61,7 +61,7 @@
     </table>
     <table name="reporting_system_updates" resource="default" engine="innodb" comment="Reporting for system updates">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="type" nullable="true" length="255" comment="Update Type"/>
         <column xsi:type="varchar" name="action" nullable="true" length="255" comment="Action Performed"/>
         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
diff --git a/app/code/Magento/Paypal/etc/db_schema.xml b/app/code/Magento/Paypal/etc/db_schema.xml
index 2703ee4f5be30..0441231e64ac3 100644
--- a/app/code/Magento/Paypal/etc/db_schema.xml
+++ b/app/code/Magento/Paypal/etc/db_schema.xml
@@ -134,7 +134,7 @@
     <table name="paypal_payment_transaction" resource="default" engine="innodb"
            comment="PayPal Payflow Link Payment Transaction">
         <column xsi:type="int" name="transaction_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="txn_id" nullable="true" length="100" comment="Txn Id"/>
         <column xsi:type="blob" name="additional_information" nullable="true" comment="Additional Information"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
diff --git a/app/code/Magento/Quote/etc/db_schema.xml b/app/code/Magento/Quote/etc/db_schema.xml
index 3bd7122e65d7f..725825e976ad7 100644
--- a/app/code/Magento/Quote/etc/db_schema.xml
+++ b/app/code/Magento/Quote/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="quote" resource="checkout" engine="innodb" comment="Sales Flat Quote">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Store Id"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="false" default="CURRENT_TIMESTAMP"
@@ -488,7 +488,7 @@
     </table>
     <table name="quote_id_mask" resource="checkout" engine="innodb" comment="Quote ID and masked ID mapping">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="quote_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Quote ID"/>
         <column xsi:type="varchar" name="masked_id" nullable="true" length="32" comment="Masked ID"/>
diff --git a/app/code/Magento/Review/etc/db_schema.xml b/app/code/Magento/Review/etc/db_schema.xml
index 1a2ff588180ce..2ae43ea608eca 100644
--- a/app/code/Magento/Review/etc/db_schema.xml
+++ b/app/code/Magento/Review/etc/db_schema.xml
@@ -95,7 +95,7 @@
         <column xsi:type="smallint" name="rating_summary" padding="6" unsigned="false" nullable="false" identity="false"
                 default="0" comment="Summarized rating"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Store id"/>
+                default="0" comment="Store ID"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="primary_id"/>
         </constraint>
@@ -108,9 +108,9 @@
     </table>
     <table name="review_store" resource="default" engine="innodb" comment="Review Store">
         <column xsi:type="bigint" name="review_id" padding="20" unsigned="true" nullable="false" identity="false"
-                comment="Review Id"/>
+                comment="Review ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="review_id"/>
             <column name="store_id"/>
@@ -125,7 +125,7 @@
     </table>
     <table name="rating_entity" resource="default" engine="innodb" comment="Rating entities">
         <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="entity_code" nullable="false" length="64" comment="Entity Code"/>
         <constraint xsi:type="primary" name="PRIMARY">
             <column name="entity_id"/>
@@ -136,9 +136,9 @@
     </table>
     <table name="rating" resource="default" engine="innodb" comment="Ratings">
         <column xsi:type="smallint" name="rating_id" padding="5" unsigned="true" nullable="false" identity="true"
-                comment="Rating Id"/>
+                comment="Rating ID"/>
         <column xsi:type="smallint" name="entity_id" padding="5" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="rating_code" nullable="false" length="64" comment="Rating Code"/>
         <column xsi:type="smallint" name="position" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Rating Position On Storefront"/>
diff --git a/app/code/Magento/Sales/etc/db_schema.xml b/app/code/Magento/Sales/etc/db_schema.xml
index 4b716e761094c..fda6e75cf00c6 100644
--- a/app/code/Magento/Sales/etc/db_schema.xml
+++ b/app/code/Magento/Sales/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="sales_order" resource="sales" engine="innodb" comment="Sales Flat Order">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="state" nullable="true" length="32" comment="State"/>
         <column xsi:type="varchar" name="status" nullable="true" length="32" comment="Status"/>
         <column xsi:type="varchar" name="coupon_code" nullable="true" length="255" comment="Coupon Code"/>
@@ -297,13 +297,13 @@
     </table>
     <table name="sales_order_grid" resource="sales" engine="innodb" comment="Sales Flat Order Grid">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="status" nullable="true" length="32" comment="Status"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
-                comment="Customer Id"/>
+                comment="Customer ID"/>
         <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
         <column xsi:type="decimal" name="base_total_paid" scale="4" precision="12" unsigned="false" nullable="true"
@@ -386,17 +386,17 @@
     </table>
     <table name="sales_order_address" resource="sales" engine="innodb" comment="Sales Flat Order Address">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="true" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="int" name="customer_address_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Customer Address Id"/>
+                comment="Customer Address ID"/>
         <column xsi:type="int" name="quote_address_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Quote Address Id"/>
+                comment="Quote Address ID"/>
         <column xsi:type="int" name="region_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Region Id"/>
+                comment="Region ID"/>
         <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Customer Id"/>
+                comment="Customer ID"/>
         <column xsi:type="varchar" name="fax" nullable="true" length="255" comment="Fax"/>
         <column xsi:type="varchar" name="region" nullable="true" length="255" comment="Region"/>
         <column xsi:type="varchar" name="postcode" nullable="true" length="255" comment="Postcode"/>
@@ -431,9 +431,9 @@
     </table>
     <table name="sales_order_status_history" resource="sales" engine="innodb" comment="Sales Flat Order Status History">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="int" name="is_customer_notified" padding="11" unsigned="false" nullable="true"
                 identity="false" comment="Is Customer Notified"/>
         <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
@@ -602,9 +602,9 @@
     </table>
     <table name="sales_order_payment" resource="sales" engine="innodb" comment="Sales Flat Order Payment">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="decimal" name="base_shipping_captured" scale="4" precision="12" unsigned="false"
                 nullable="true" comment="Base Shipping Captured"/>
         <column xsi:type="decimal" name="shipping_captured" scale="4" precision="12" unsigned="false" nullable="true"
@@ -696,9 +696,9 @@
     </table>
     <table name="sales_shipment" resource="sales" engine="innodb" comment="Sales Flat Shipment">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <column xsi:type="decimal" name="total_weight" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Total Weight"/>
         <column xsi:type="decimal" name="total_qty" scale="4" precision="12" unsigned="false" nullable="true"
@@ -708,13 +708,13 @@
         <column xsi:type="smallint" name="send_email" padding="5" unsigned="true" nullable="true" identity="false"
                 comment="Send Email"/>
         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Order Id"/>
+                comment="Order ID"/>
         <column xsi:type="int" name="customer_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Customer Id"/>
+                comment="Customer ID"/>
         <column xsi:type="int" name="shipping_address_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Shipping Address Id"/>
+                comment="Shipping Address ID"/>
         <column xsi:type="int" name="billing_address_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Billing Address Id"/>
+                comment="Billing Address ID"/>
         <column xsi:type="int" name="shipment_status" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="Shipment Status"/>
         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
@@ -762,13 +762,13 @@
     </table>
     <table name="sales_shipment_grid" resource="sales" engine="innodb" comment="Sales Flat Shipment Grid">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <column xsi:type="varchar" name="order_increment_id" nullable="false" length="32" comment="Order Increment Id"/>
         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Order Id"/>
+                comment="Order ID"/>
         <column xsi:type="timestamp" name="order_created_at" on_update="true" nullable="true"
                 default="CURRENT_TIMESTAMP" comment="Order Increment Id"/>
         <column xsi:type="varchar" name="customer_name" nullable="false" length="128" comment="Customer Name"/>
@@ -837,9 +837,9 @@
     </table>
     <table name="sales_shipment_item" resource="sales" engine="innodb" comment="Sales Flat Shipment Item">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="decimal" name="row_total" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Row Total"/>
         <column xsi:type="decimal" name="price" scale="4" precision="12" unsigned="false" nullable="true"
@@ -848,9 +848,9 @@
                 comment="Weight"/>
         <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="true" comment="Qty"/>
         <column xsi:type="int" name="product_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Product Id"/>
+                comment="Product ID"/>
         <column xsi:type="int" name="order_item_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Order Item Id"/>
+                comment="Order Item ID"/>
         <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
@@ -867,14 +867,14 @@
     </table>
     <table name="sales_shipment_track" resource="sales" engine="innodb" comment="Sales Flat Shipment Track">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="decimal" name="weight" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Weight"/>
         <column xsi:type="decimal" name="qty" scale="4" precision="12" unsigned="false" nullable="true" comment="Qty"/>
         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Order Id"/>
+                comment="Order ID"/>
         <column xsi:type="text" name="track_number" nullable="true" comment="Number"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="varchar" name="title" nullable="true" length="255" comment="Title"/>
@@ -901,9 +901,9 @@
     </table>
     <table name="sales_shipment_comment" resource="sales" engine="innodb" comment="Sales Flat Shipment Comment">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="int" name="is_customer_notified" padding="11" unsigned="false" nullable="true"
                 identity="false" comment="Is Customer Notified"/>
         <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
@@ -926,9 +926,9 @@
     </table>
     <table name="sales_invoice" resource="sales" engine="innodb" comment="Sales Flat Invoice">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <column xsi:type="decimal" name="base_grand_total" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Grand Total"/>
         <column xsi:type="decimal" name="shipping_tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
@@ -1051,15 +1051,15 @@
     </table>
     <table name="sales_invoice_grid" resource="sales" engine="innodb" comment="Sales Flat Invoice Grid">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
         <column xsi:type="int" name="state" padding="11" unsigned="false" nullable="true" identity="false"
                 comment="State"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <column xsi:type="varchar" name="store_name" nullable="true" length="255" comment="Store Name"/>
         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Order Id"/>
+                comment="Order ID"/>
         <column xsi:type="varchar" name="order_increment_id" nullable="true" length="50" comment="Order Increment Id"/>
         <column xsi:type="timestamp" name="order_created_at" on_update="false" nullable="true"
                 comment="Order Created At"/>
@@ -1136,9 +1136,9 @@
     </table>
     <table name="sales_invoice_item" resource="sales" engine="innodb" comment="Sales Flat Invoice Item">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="decimal" name="base_price" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Price"/>
         <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
@@ -1192,9 +1192,9 @@
     </table>
     <table name="sales_invoice_comment" resource="sales" engine="innodb" comment="Sales Flat Invoice Comment">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="smallint" name="is_customer_notified" padding="5" unsigned="true" nullable="true"
                 identity="false" comment="Is Customer Notified"/>
         <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
@@ -1217,9 +1217,9 @@
     </table>
     <table name="sales_creditmemo" resource="sales" engine="innodb" comment="Sales Flat Creditmemo">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <column xsi:type="decimal" name="adjustment_positive" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Adjustment Positive"/>
         <column xsi:type="decimal" name="base_shipping_tax_amount" scale="4" precision="12" unsigned="false"
@@ -1350,12 +1350,12 @@
     </table>
     <table name="sales_creditmemo_grid" resource="sales" engine="innodb" comment="Sales Flat Creditmemo Grid">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="increment_id" nullable="true" length="50" comment="Increment Id"/>
         <column xsi:type="timestamp" name="created_at" on_update="false" nullable="true" comment="Created At"/>
         <column xsi:type="timestamp" name="updated_at" on_update="false" nullable="true" comment="Updated At"/>
         <column xsi:type="int" name="order_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Order Id"/>
+                comment="Order ID"/>
         <column xsi:type="varchar" name="order_increment_id" nullable="true" length="50" comment="Order Increment Id"/>
         <column xsi:type="timestamp" name="order_created_at" on_update="false" nullable="true"
                 comment="Order Created At"/>
@@ -1366,7 +1366,7 @@
                 comment="Base Grand Total"/>
         <column xsi:type="varchar" name="order_status" nullable="true" length="32" comment="Order Status"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="true" identity="false"
-                comment="Store Id"/>
+                comment="Store ID"/>
         <column xsi:type="varchar" name="billing_address" nullable="true" length="255" comment="Billing Address"/>
         <column xsi:type="varchar" name="shipping_address" nullable="true" length="255" comment="Shipping Address"/>
         <column xsi:type="varchar" name="customer_name" nullable="false" length="128" comment="Customer Name"/>
@@ -1438,9 +1438,9 @@
     </table>
     <table name="sales_creditmemo_item" resource="sales" engine="innodb" comment="Sales Flat Creditmemo Item">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="decimal" name="base_price" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Base Price"/>
         <column xsi:type="decimal" name="tax_amount" scale="4" precision="12" unsigned="false" nullable="true"
@@ -1469,9 +1469,9 @@
         <column xsi:type="decimal" name="row_total_incl_tax" scale="4" precision="12" unsigned="false" nullable="true"
                 comment="Row Total Incl Tax"/>
         <column xsi:type="int" name="product_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Product Id"/>
+                comment="Product ID"/>
         <column xsi:type="int" name="order_item_id" padding="11" unsigned="false" nullable="true" identity="false"
-                comment="Order Item Id"/>
+                comment="Order Item ID"/>
         <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="varchar" name="sku" nullable="true" length="255" comment="Sku"/>
@@ -1494,9 +1494,9 @@
     </table>
     <table name="sales_creditmemo_comment" resource="sales" engine="innodb" comment="Sales Flat Creditmemo Comment">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="parent_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Parent Id"/>
+                comment="Parent ID"/>
         <column xsi:type="int" name="is_customer_notified" padding="11" unsigned="false" nullable="true"
                 identity="false" comment="Is Customer Notified"/>
         <column xsi:type="smallint" name="is_visible_on_front" padding="5" unsigned="true" nullable="false"
diff --git a/app/code/Magento/SalesRule/etc/db_schema.xml b/app/code/Magento/SalesRule/etc/db_schema.xml
index 3d882ee2eae67..145ed0c96d95f 100644
--- a/app/code/Magento/SalesRule/etc/db_schema.xml
+++ b/app/code/Magento/SalesRule/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="salesrule" resource="default" engine="innodb" comment="Salesrule">
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="varchar" name="name" nullable="true" length="255" comment="Name"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="date" name="from_date" comment="From"/>
@@ -60,7 +60,7 @@
         <column xsi:type="int" name="coupon_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Coupon Id"/>
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Rule Id"/>
+                comment="Rule ID"/>
         <column xsi:type="varchar" name="code" nullable="true" length="255" comment="Code"/>
         <column xsi:type="int" name="usage_limit" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Usage Limit"/>
@@ -117,7 +117,7 @@
         <column xsi:type="int" name="rule_customer_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Rule Customer Id"/>
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false" default="0"
-                comment="Rule Id"/>
+                comment="Rule ID"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Customer Id"/>
         <column xsi:type="smallint" name="times_used" padding="5" unsigned="true" nullable="false" identity="false"
@@ -143,7 +143,7 @@
         <column xsi:type="int" name="label_id" padding="10" unsigned="true" nullable="false" identity="true"
                 comment="Label Id"/>
         <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
-                comment="Rule Id"/>
+                comment="Rule ID"/>
         <column xsi:type="smallint" name="store_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Store Id"/>
         <column xsi:type="varchar" name="label" nullable="true" length="255" comment="Label"/>
@@ -163,7 +163,8 @@
         </index>
     </table>
     <table name="salesrule_product_attribute" resource="default" engine="innodb" comment="Salesrule Product Attribute">
-        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Website Id"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
@@ -318,7 +319,8 @@
         </index>
     </table>
     <table name="salesrule_website" resource="default" engine="innodb" comment="Sales Rules To Websites Relations">
-        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
                 comment="Website Id"/>
         <constraint xsi:type="primary" name="PRIMARY">
@@ -336,7 +338,8 @@
     </table>
     <table name="salesrule_customer_group" resource="default" engine="innodb"
            comment="Sales Rules To Customer Groups Relations">
-        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"/>
+        <column xsi:type="int" name="rule_id" padding="10" unsigned="true" nullable="false" identity="false"
+                comment="Rule ID"/>
         <column xsi:type="int" name="customer_group_id" padding="10" unsigned="true" nullable="false" identity="false"
                 comment="Customer Group Id"/>
         <constraint xsi:type="primary" name="PRIMARY">
diff --git a/app/code/Magento/Signifyd/etc/db_schema.xml b/app/code/Magento/Signifyd/etc/db_schema.xml
index 6a31eacbb45f5..6f41b883c71e1 100644
--- a/app/code/Magento/Signifyd/etc/db_schema.xml
+++ b/app/code/Magento/Signifyd/etc/db_schema.xml
@@ -37,6 +37,7 @@
         </constraint>
     </table>
     <table name="sales_order_grid" resource="sales" comment="Sales Flat Order Grid">
-        <column xsi:type="varchar" name="signifyd_guarantee_status" nullable="true" length="32"/>
+        <column xsi:type="varchar" name="signifyd_guarantee_status" nullable="true" length="32"
+                comment="Signifyd Guarantee Disposition Status"/>
     </table>
 </schema>
diff --git a/app/code/Magento/Vault/etc/db_schema.xml b/app/code/Magento/Vault/etc/db_schema.xml
index ed1f2adba2142..e9645e211ae9b 100644
--- a/app/code/Magento/Vault/etc/db_schema.xml
+++ b/app/code/Magento/Vault/etc/db_schema.xml
@@ -9,7 +9,7 @@
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="vault_payment_token" resource="default" engine="innodb" comment="Vault tokens of payment">
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="true"
-                comment="Entity Id"/>
+                comment="Entity ID"/>
         <column xsi:type="int" name="customer_id" padding="10" unsigned="true" nullable="true" identity="false"
                 comment="Customer Id"/>
         <column xsi:type="varchar" name="public_hash" nullable="false" length="128"
diff --git a/app/code/Magento/Weee/etc/db_schema.xml b/app/code/Magento/Weee/etc/db_schema.xml
index 96c3be9740e56..49b201acb3375 100644
--- a/app/code/Magento/Weee/etc/db_schema.xml
+++ b/app/code/Magento/Weee/etc/db_schema.xml
@@ -13,7 +13,7 @@
         <column xsi:type="smallint" name="website_id" padding="5" unsigned="true" nullable="false" identity="false"
                 default="0" comment="Website Id"/>
         <column xsi:type="int" name="entity_id" padding="10" unsigned="true" nullable="false" identity="false"
-                default="0" comment="Entity Id"/>
+                default="0" comment="Entity ID"/>
         <column xsi:type="varchar" name="country" nullable="true" length="2" comment="Country"/>
         <column xsi:type="decimal" name="value" scale="4" precision="12" unsigned="false" nullable="false" default="0"
                 comment="Value"/>