diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
index e9f081a5..b4ec5e1a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.resx
@@ -4880,7 +4880,7 @@ The Query Processor estimates that implementing the following index could improv
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexNamePropertyDescription" xml:space="preserve">
-    <value>Name of the column store index</value>
+    <value>Name of the columnstore index</value>
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexDescriptionPropertyTitle" xml:space="preserve">
@@ -4888,11 +4888,11 @@ The Query Processor estimates that implementing the following index could improv
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexDescriptionPropertyDescription" xml:space="preserve">
-    <value>Description of the column store index</value>
+    <value>Description of the columnstore index</value>
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexIsClusteredPropertyDescription" xml:space="preserve">
-    <value>Whether the column store index is clustered.</value>
+    <value>Whether the columnstore index is clustered.</value>
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexIsClusteredPropertyTitle" xml:space="preserve">
@@ -4900,7 +4900,7 @@ The Query Processor estimates that implementing the following index could improv
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexFilterPredicatePropertyDescription" xml:space="preserve">
-    <value>Filter predicate of the column store index</value>
+    <value>Filter predicate of the columnstore index</value>
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexFilterPredicatePropertyTitle" xml:space="preserve">
@@ -4908,7 +4908,7 @@ The Query Processor estimates that implementing the following index could improv
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexColumnsPropertyDescription" xml:space="preserve">
-    <value>Columns in this column store index</value>
+    <value>Columns in this columnstore index</value>
     <comment></comment>
   </data>
   <data name="ColumnStoreIndexColumnsGroupTitle" xml:space="preserve">
@@ -4952,15 +4952,15 @@ The Query Processor estimates that implementing the following index could improv
     <comment></comment>
   </data>
   <data name="TableDesignerColumnStoreIndexesTableTitle" xml:space="preserve">
-    <value>Column Store Indexes</value>
+    <value>Columnstore Indexes</value>
     <comment></comment>
   </data>
   <data name="TableDesignerColumnStoreIndexObjectType" xml:space="preserve">
-    <value>Column Store Index</value>
+    <value>Columnstore Index</value>
     <comment></comment>
   </data>
   <data name="AddNewColumnStoreIndexLabel" xml:space="preserve">
-    <value>New Column Store Index</value>
+    <value>New Columnstore Index</value>
     <comment></comment>
   </data>
   <data name="TableDesignerEdgeConstraintsTabTitle" xml:space="preserve">
@@ -5301,12 +5301,12 @@ The Query Processor estimates that implementing the following index could improv
  Parameters: 0 - indexName (string) </comment>
   </data>
   <data name="ColumnCanOnlyAppearOnceInNonClusteredColumnStoreIndexRuleDescription" xml:space="preserve">
-    <value>Column with name &apos;{0}&apos; has already been added to the non-clustered column store index &apos;{1}&apos;. Row number: {2}.</value>
+    <value>Column with name &apos;{0}&apos; has already been added to the non-clustered columnstore index &apos;{1}&apos;. Row number: {2}.</value>
     <comment>.
  Parameters: 0 - columnName (string), 1 - indexName (string), 2 - rowNumber (int) </comment>
   </data>
   <data name="NonClusteredColumnStoreIndexMustHaveColumnsRuleDescription" xml:space="preserve">
-    <value>Non-clustered column store index &apos;{0}&apos; does not have any columns associated with it.</value>
+    <value>Non-clustered columnstore index &apos;{0}&apos; does not have any columns associated with it.</value>
     <comment>.
  Parameters: 0 - indexName (string) </comment>
   </data>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
index 0945eaa0..fe6ccb2d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.strings
@@ -2305,14 +2305,14 @@ IndexBucketCountPropertyTitle = Bucket Count
 HashIndexGroupTitle = Hash Index
 TableDesignerColumnsDisplayValueTitle = Columns
 ColumnStoreIndexNamePropertyTitle = Name
-ColumnStoreIndexNamePropertyDescription = Name of the column store index
+ColumnStoreIndexNamePropertyDescription = Name of the columnstore index
 ColumnStoreIndexDescriptionPropertyTitle = Description
-ColumnStoreIndexDescriptionPropertyDescription = Description of the column store index
-ColumnStoreIndexIsClusteredPropertyDescription = Whether the column store index is clustered.
+ColumnStoreIndexDescriptionPropertyDescription = Description of the columnstore index
+ColumnStoreIndexIsClusteredPropertyDescription = Whether the columnstore index is clustered.
 ColumnStoreIndexIsClusteredPropertyTitle = Is Clustered
-ColumnStoreIndexFilterPredicatePropertyDescription = Filter predicate of the column store index
+ColumnStoreIndexFilterPredicatePropertyDescription = Filter predicate of the columnstore index
 ColumnStoreIndexFilterPredicatePropertyTitle = Filter Predicate
-ColumnStoreIndexColumnsPropertyDescription = Columns in this column store index
+ColumnStoreIndexColumnsPropertyDescription = Columns in this columnstore index
 ColumnStoreIndexColumnsGroupTitle = Columns
 ColumnStoreIndexAddColumn = Add Column
 ColumnStoreIndexColumnPropertyName = Column
@@ -2323,9 +2323,9 @@ TableDesignerGraphTableTypeDescription = Specifies the table type.
 TableDesignerGraphTableTypeEdge = Edge
 TableDesignerGraphTableTypeNode = Node
 TableDesignerGraphTableTypeNone = None
-TableDesignerColumnStoreIndexesTableTitle = Column Store Indexes
-TableDesignerColumnStoreIndexObjectType = Column Store Index
-AddNewColumnStoreIndexLabel = New Column Store Index
+TableDesignerColumnStoreIndexesTableTitle = Columnstore Indexes
+TableDesignerColumnStoreIndexObjectType = Columnstore Index
+AddNewColumnStoreIndexLabel = New Columnstore Index
 TableDesignerEdgeConstraintsTabTitle = Edge Constraints
 TableDesignerEdgeConstraintObjectType = Edge Constraint
 TableDesignerEdgeConstraintNamePropertyDescription = Name of the constraint.
@@ -2406,8 +2406,8 @@ ComputedColumnNeedToBePersistedAndNotNullInPrimaryKeyRuleDescription(string colu
 ComputedColumnNeedToBePersistedInForeignKeyRuleDescription(string columnName, string foreignKeyName) = The computed column with name '{0}' has to be persisted to be part of the foreign key '{1}'.
 HashIndexNotSupportedInNonMemoryOptimizedTableRuleDescription(string indexName) = Hash index with name '{0}' is not supported on a non memory-optimized table.
 HashIndexMustHaveBucketCountRuleDescription(string indexName) = Hash index '{0}' does not have a bucket count.
-ColumnCanOnlyAppearOnceInNonClusteredColumnStoreIndexRuleDescription(string columnName, string indexName, int rowNumber) = Column with name '{0}' has already been added to the non-clustered column store index '{1}'. Row number: {2}.
-NonClusteredColumnStoreIndexMustHaveColumnsRuleDescription(string indexName) = Non-clustered column store index '{0}' does not have any columns associated with it.
+ColumnCanOnlyAppearOnceInNonClusteredColumnStoreIndexRuleDescription(string columnName, string indexName, int rowNumber) = Column with name '{0}' has already been added to the non-clustered columnstore index '{1}'. Row number: {2}.
+NonClusteredColumnStoreIndexMustHaveColumnsRuleDescription(string indexName) = Non-clustered columnstore index '{0}' does not have any columns associated with it.
 TableDesignerConfirmationText = I have read the summary and understand the potential risks.
 
 ############################################################################
diff --git a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
index bfa26a65..898a0d12 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
+++ b/src/Microsoft.SqlTools.ServiceLayer/Localization/sr.xlf
@@ -6408,8 +6408,8 @@ The Query Processor estimates that implementing the following index could improv
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexNamePropertyDescription">
-        <source>Name of the column store index</source>
-        <target state="new">Name of the column store index</target>
+        <source>Name of the columnstore index</source>
+        <target state="new">Name of the columnstore index</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexDescriptionPropertyTitle">
@@ -6418,13 +6418,13 @@ The Query Processor estimates that implementing the following index could improv
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexDescriptionPropertyDescription">
-        <source>Description of the column store index</source>
-        <target state="new">Description of the column store index</target>
+        <source>Description of the columnstore index</source>
+        <target state="new">Description of the columnstore index</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexIsClusteredPropertyDescription">
-        <source>Whether the column store index is clustered.</source>
-        <target state="new">Whether the column store index is clustered.</target>
+        <source>Whether the columnstore index is clustered.</source>
+        <target state="new">Whether the columnstore index is clustered.</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexIsClusteredPropertyTitle">
@@ -6433,8 +6433,8 @@ The Query Processor estimates that implementing the following index could improv
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexFilterPredicatePropertyDescription">
-        <source>Filter predicate of the column store index</source>
-        <target state="new">Filter predicate of the column store index</target>
+        <source>Filter predicate of the columnstore index</source>
+        <target state="new">Filter predicate of the columnstore index</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexFilterPredicatePropertyTitle">
@@ -6443,8 +6443,8 @@ The Query Processor estimates that implementing the following index could improv
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexColumnsPropertyDescription">
-        <source>Columns in this column store index</source>
-        <target state="new">Columns in this column store index</target>
+        <source>Columns in this columnstore index</source>
+        <target state="new">Columns in this columnstore index</target>
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnStoreIndexColumnsGroupTitle">
@@ -6463,29 +6463,29 @@ The Query Processor estimates that implementing the following index could improv
         <note></note>
       </trans-unit>
       <trans-unit id="ColumnCanOnlyAppearOnceInNonClusteredColumnStoreIndexRuleDescription">
-        <source>Column with name '{0}' has already been added to the non-clustered column store index '{1}'. Row number: {2}.</source>
-        <target state="new">Column with name '{0}' has already been added to the non-clustered column store index '{1}'. Row number: {2}.</target>
+        <source>Column with name '{0}' has already been added to the non-clustered columnstore index '{1}'. Row number: {2}.</source>
+        <target state="new">Column with name '{0}' has already been added to the non-clustered columnstore index '{1}'. Row number: {2}.</target>
         <note>.
  Parameters: 0 - columnName (string), 1 - indexName (string), 2 - rowNumber (int) </note>
       </trans-unit>
       <trans-unit id="TableDesignerColumnStoreIndexesTableTitle">
-        <source>Column Store Indexes</source>
-        <target state="new">Column Store Indexes</target>
+        <source>Columnstore Indexes</source>
+        <target state="new">Columnstore Indexes</target>
         <note></note>
       </trans-unit>
       <trans-unit id="TableDesignerColumnStoreIndexObjectType">
-        <source>Column Store Index</source>
-        <target state="new">Column Store Index</target>
+        <source>Columnstore Index</source>
+        <target state="new">Columnstore Index</target>
         <note></note>
       </trans-unit>
       <trans-unit id="AddNewColumnStoreIndexLabel">
-        <source>New Column Store Index</source>
-        <target state="new">New Column Store Index</target>
+        <source>New Columnstore Index</source>
+        <target state="new">New Columnstore Index</target>
         <note></note>
       </trans-unit>
       <trans-unit id="NonClusteredColumnStoreIndexMustHaveColumnsRuleDescription">
-        <source>Non-clustered column store index '{0}' does not have any columns associated with it.</source>
-        <target state="new">Non-clustered column store index '{0}' does not have any columns associated with it.</target>
+        <source>Non-clustered columnstore index '{0}' does not have any columns associated with it.</source>
+        <target state="new">Non-clustered columnstore index '{0}' does not have any columns associated with it.</target>
         <note>.
  Parameters: 0 - indexName (string) </note>
       </trans-unit>
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ColumnStoreIndexViewModel.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ColumnStoreIndexViewModel.cs
index b5aff70a..7c16585d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ColumnStoreIndexViewModel.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/ViewModel/ColumnStoreIndexViewModel.cs
@@ -6,7 +6,7 @@
 namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts
 {
     /// <summary>
-    /// The view model of column store index.
+    /// The view model of columnstore index.
     /// </summary>
     public class ColumnStoreIndexViewModel : ObjectViewModelBase
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs
index 250cb206..1ee283fe 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs
@@ -1060,7 +1060,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
                 indexVM.Columns.CanAddRows = !index.IsClustered;
                 indexVM.ColumnsDisplayValue.Enabled = false;
 
-                // avoid populating columns for CLUSTERED column store index
+                // avoid populating columns for CLUSTERED columnstore index
                 if (!index.IsClustered)
                 {
                     indexVM.ColumnsDisplayValue.Value = index.ColumnsDisplayValue;
@@ -1432,6 +1432,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner
             var columnStoreIndexesTableProperties = new TableComponentProperties<ColumnStoreIndexViewModel>()
             {
                 Title = SR.TableDesignerColumnStoreIndexesTableTitle,
+                AriaLabel = SR.TableDesignerColumnStoreIndexesTableTitle,
                 ObjectTypeDisplayName = SR.TableDesignerColumnStoreIndexObjectType,
                 LabelForAddNewButton = SR.AddNewColumnStoreIndexLabel
             };