diff --git a/src/components-examples/cdk/table/cdk-table-basic-flex/cdk-table-basic-flex-example.css b/src/components-examples/cdk/table/cdk-table-flex-basic/cdk-table-flex-basic-example.css
similarity index 100%
rename from src/components-examples/cdk/table/cdk-table-basic-flex/cdk-table-basic-flex-example.css
rename to src/components-examples/cdk/table/cdk-table-flex-basic/cdk-table-flex-basic-example.css
diff --git a/src/components-examples/cdk/table/cdk-table-basic-flex/cdk-table-basic-flex-example.html b/src/components-examples/cdk/table/cdk-table-flex-basic/cdk-table-flex-basic-example.html
similarity index 100%
rename from src/components-examples/cdk/table/cdk-table-basic-flex/cdk-table-basic-flex-example.html
rename to src/components-examples/cdk/table/cdk-table-flex-basic/cdk-table-flex-basic-example.html
diff --git a/src/components-examples/cdk/table/cdk-table-basic-flex/cdk-table-basic-flex-example.ts b/src/components-examples/cdk/table/cdk-table-flex-basic/cdk-table-flex-basic-example.ts
similarity index 91%
rename from src/components-examples/cdk/table/cdk-table-basic-flex/cdk-table-basic-flex-example.ts
rename to src/components-examples/cdk/table/cdk-table-flex-basic/cdk-table-flex-basic-example.ts
index 6e255f9a1d35..76f9a2a4f231 100644
--- a/src/components-examples/cdk/table/cdk-table-basic-flex/cdk-table-basic-flex-example.ts
+++ b/src/components-examples/cdk/table/cdk-table-flex-basic/cdk-table-flex-basic-example.ts
@@ -26,11 +26,11 @@ const ELEMENT_DATA: PeriodicElement[] = [
  * @title Basic use of `<cdk-table>` (uses display flex)
  */
 @Component({
-  selector: 'cdk-table-basic-flex-example',
-  styleUrls: ['cdk-table-basic-flex-example.css'],
-  templateUrl: 'cdk-table-basic-flex-example.html',
+  selector: 'cdk-table-flex-basic-example',
+  styleUrls: ['cdk-table-flex-basic-example.css'],
+  templateUrl: 'cdk-table-flex-basic-example.html',
 })
-export class CdkTableBasicFlexExample {
+export class CdkTableFlexBasicExample {
   displayedColumns: string[] = ['position', 'name', 'weight', 'symbol'];
   dataSource = new ExampleDataSource();
 }
diff --git a/src/components-examples/cdk/table/index.ts b/src/components-examples/cdk/table/index.ts
index 7a2e6ecd3d07..5992abba0cfb 100644
--- a/src/components-examples/cdk/table/index.ts
+++ b/src/components-examples/cdk/table/index.ts
@@ -1,16 +1,16 @@
 import {CdkTableModule} from '@angular/cdk/table';
 import {NgModule} from '@angular/core';
-import {CdkTableBasicFlexExample} from './cdk-table-basic-flex/cdk-table-basic-flex-example';
+import {CdkTableFlexBasicExample} from './cdk-table-flex-basic/cdk-table-flex-basic-example';
 import {CdkTableBasicExample} from './cdk-table-basic/cdk-table-basic-example';
 
 export {
   CdkTableBasicExample,
-  CdkTableBasicFlexExample,
+  CdkTableFlexBasicExample,
 };
 
 const EXAMPLES = [
   CdkTableBasicExample,
-  CdkTableBasicFlexExample,
+  CdkTableFlexBasicExample,
 ];
 
 @NgModule({
diff --git a/src/components-examples/material/table/index.ts b/src/components-examples/material/table/index.ts
index 5ad5caddd437..8bbaf1454029 100644
--- a/src/components-examples/material/table/index.ts
+++ b/src/components-examples/material/table/index.ts
@@ -12,7 +12,7 @@ import {MatTableModule} from '@angular/material/table';
 import {DragDropModule} from '@angular/cdk/drag-drop';
 import {CdkTableModule} from '@angular/cdk/table';
 
-import {TableBasicFlexExample} from './table-basic-flex/table-basic-flex-example';
+import {TableFlexBasicExample} from './table-flex-basic/table-flex-basic-example';
 import {TableBasicExample} from './table-basic/table-basic-example';
 import {TableDynamicColumnsExample} from './table-dynamic-columns/table-dynamic-columns-example';
 import {TableExpandableRowsExample} from './table-expandable-rows/table-expandable-rows-example';
@@ -42,7 +42,7 @@ import {TableWrappedExample, WrapperTable} from './table-wrapped/table-wrapped-e
 import {TableReorderableExample} from './table-reorderable/table-reorderable-example';
 
 export {
-  TableBasicExample,          TableBasicFlexExample,
+  TableBasicExample,          TableFlexBasicExample,
   TableDynamicColumnsExample, TableExpandableRowsExample,
   TableFilteringExample,      TableFooterRowExample,
   TableHttpExample,           TableMultipleHeaderFooterExample,
@@ -57,7 +57,7 @@ export {
 };
 
 const EXAMPLES = [
-  TableBasicExample,          TableBasicFlexExample,
+  TableBasicExample,          TableFlexBasicExample,
   TableDynamicColumnsExample, TableExpandableRowsExample,
   TableFilteringExample,      TableFooterRowExample,
   TableHttpExample,           TableMultipleHeaderFooterExample,
diff --git a/src/components-examples/material/table/table-basic-flex/table-basic-flex-example.css b/src/components-examples/material/table/table-flex-basic/table-flex-basic-example.css
similarity index 100%
rename from src/components-examples/material/table/table-basic-flex/table-basic-flex-example.css
rename to src/components-examples/material/table/table-flex-basic/table-flex-basic-example.css
diff --git a/src/components-examples/material/table/table-basic-flex/table-basic-flex-example.html b/src/components-examples/material/table/table-flex-basic/table-flex-basic-example.html
similarity index 100%
rename from src/components-examples/material/table/table-basic-flex/table-basic-flex-example.html
rename to src/components-examples/material/table/table-flex-basic/table-flex-basic-example.html
diff --git a/src/components-examples/material/table/table-basic-flex/table-basic-flex-example.ts b/src/components-examples/material/table/table-flex-basic/table-flex-basic-example.ts
similarity index 85%
rename from src/components-examples/material/table/table-basic-flex/table-basic-flex-example.ts
rename to src/components-examples/material/table/table-flex-basic/table-flex-basic-example.ts
index eb0066c4cf50..6a9ae8b725b2 100644
--- a/src/components-examples/material/table/table-basic-flex/table-basic-flex-example.ts
+++ b/src/components-examples/material/table/table-flex-basic/table-flex-basic-example.ts
@@ -24,11 +24,11 @@ const ELEMENT_DATA: PeriodicElement[] = [
  * @title Basic use of `<mat-table>` (uses display flex)
  */
 @Component({
-  selector: 'table-basic-flex-example',
-  styleUrls: ['table-basic-flex-example.css'],
-  templateUrl: 'table-basic-flex-example.html',
+  selector: 'table-flex-basic-example',
+  styleUrls: ['table-flex-basic-example.css'],
+  templateUrl: 'table-flex-basic-example.html',
 })
-export class TableBasicFlexExample {
+export class TableFlexBasicExample {
   displayedColumns: string[] = ['position', 'name', 'weight', 'symbol'];
   dataSource = ELEMENT_DATA;
 }
diff --git a/src/dev-app/table/table-demo.html b/src/dev-app/table/table-demo.html
index 1578bbfdbbc0..4793e15e5484 100644
--- a/src/dev-app/table/table-demo.html
+++ b/src/dev-app/table/table-demo.html
@@ -2,13 +2,13 @@ <h3>Cdk table basic</h3>
 <cdk-table-basic-example></cdk-table-basic-example>
 
 <h3>Cdk table basic flex</h3>
-<cdk-table-basic-flex-example></cdk-table-basic-flex-example>
+<cdk-table-flex-basic-example></cdk-table-flex-basic-example>
 
 <h3>Table basic</h3>
 <table-basic-example></table-basic-example>
 
 <h3>Table basic flex</h3>
-<table-basic-flex-example></table-basic-flex-example>
+<table-flex-basic-example></table-flex-basic-example>
 
 <h3>Table dynamic columns</h3>
 <table-dynamic-columns-example></table-dynamic-columns-example>