diff --git a/src/components/DataTableSkeleton/DataTableSkeleton-test.js b/src/components/DataTableSkeleton/DataTableSkeleton-test.js
index 641cab4de1..67474ff28e 100644
--- a/src/components/DataTableSkeleton/DataTableSkeleton-test.js
+++ b/src/components/DataTableSkeleton/DataTableSkeleton-test.js
@@ -25,7 +25,7 @@ describe('DataTableSkeleton', () => {
 
     it('Has the expected classes', () => {
       expect(wrapper.hasClass('bx--skeleton')).toEqual(true);
-      expect(wrapper.hasClass('bx--data-table-v2')).toEqual(true);
+      expect(wrapper.hasClass('bx--data-table')).toEqual(true);
     });
 
     it('Has the correct number of rows and columns', () => {
@@ -50,8 +50,8 @@ describe('DataTableSkeleton Compact', () => {
 
     it('Has the expected classes', () => {
       expect(wrapper.hasClass('bx--skeleton')).toEqual(true);
-      expect(wrapper.hasClass('bx--data-table-v2')).toEqual(true);
-      expect(wrapper.hasClass('bx--data-table-v2--compact')).toEqual(true);
+      expect(wrapper.hasClass('bx--data-table')).toEqual(true);
+      expect(wrapper.hasClass('bx--data-table--compact')).toEqual(true);
     });
   });
 });
@@ -62,8 +62,8 @@ describe('DataTableSkeleton Zebra', () => {
 
     it('Has the expected classes', () => {
       expect(wrapper.hasClass('bx--skeleton')).toEqual(true);
-      expect(wrapper.hasClass('bx--data-table-v2')).toEqual(true);
-      expect(wrapper.hasClass('bx--data-table-v2--zebra')).toEqual(true);
+      expect(wrapper.hasClass('bx--data-table')).toEqual(true);
+      expect(wrapper.hasClass('bx--data-table--zebra')).toEqual(true);
     });
   });
 });
diff --git a/src/components/DataTableSkeleton/DataTableSkeleton.js b/src/components/DataTableSkeleton/DataTableSkeleton.js
index 5f07ba9861..3ea1b9c45b 100644
--- a/src/components/DataTableSkeleton/DataTableSkeleton.js
+++ b/src/components/DataTableSkeleton/DataTableSkeleton.js
@@ -22,9 +22,9 @@ const DataTableSkeleton = ({
 }) => {
   const dataTableSkeletonClasses = classNames({
     [`${prefix}--skeleton`]: true,
-    [`${prefix}--data-table-v2`]: true,
-    [`${prefix}--data-table-v2--zebra`]: zebra,
-    [`${prefix}--data-table-v2--compact`]: compact,
+    [`${prefix}--data-table`]: true,
+    [`${prefix}--data-table--zebra`]: zebra,
+    [`${prefix}--data-table--compact`]: compact,
   });
 
   let normalizedHeaders;