diff --git a/desktop/flipper-plugin/src/index.ts b/desktop/flipper-plugin/src/index.ts
index 1fb97e2b2..40941e3c7 100644
--- a/desktop/flipper-plugin/src/index.ts
+++ b/desktop/flipper-plugin/src/index.ts
@@ -82,8 +82,8 @@ export {Idler} from './utils/Idler';
 
 export {createDataSource, DataSource} from './state/DataSource';
 
-export {DataTable, DataTableColumn} from './ui/datatable/DataTable';
-export {DataTableManager} from './ui/datatable/DataTableManager';
+export {DataTable, DataTableColumn} from './ui/data-table/DataTable';
+export {DataTableManager} from './ui/data-table/DataTableManager';
 
 export {
   Interactive as _Interactive,
diff --git a/desktop/flipper-plugin/src/ui/DataFormatter.tsx b/desktop/flipper-plugin/src/ui/DataFormatter.tsx
index b0f7a7afe..5dd36c16a 100644
--- a/desktop/flipper-plugin/src/ui/DataFormatter.tsx
+++ b/desktop/flipper-plugin/src/ui/DataFormatter.tsx
@@ -18,7 +18,7 @@ import React, {createElement, Fragment, isValidElement, useState} from 'react';
 import {tryGetFlipperLibImplementation} from '../plugin/FlipperLib';
 import {safeStringify} from '../utils/safeStringify';
 import {urlRegex} from '../utils/urlRegex';
-import {useTableRedraw} from './datatable/DataSourceRenderer';
+import {useTableRedraw} from './data-table/DataSourceRenderer';
 import {theme} from './theme';
 
 /**
diff --git a/desktop/flipper-plugin/src/ui/datatable/ColumnFilter.tsx b/desktop/flipper-plugin/src/ui/data-table/ColumnFilter.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/ColumnFilter.tsx
rename to desktop/flipper-plugin/src/ui/data-table/ColumnFilter.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/DataSourceRenderer.tsx b/desktop/flipper-plugin/src/ui/data-table/DataSourceRenderer.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/DataSourceRenderer.tsx
rename to desktop/flipper-plugin/src/ui/data-table/DataSourceRenderer.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/DataTable.tsx b/desktop/flipper-plugin/src/ui/data-table/DataTable.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/DataTable.tsx
rename to desktop/flipper-plugin/src/ui/data-table/DataTable.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/DataTableManager.tsx b/desktop/flipper-plugin/src/ui/data-table/DataTableManager.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/DataTableManager.tsx
rename to desktop/flipper-plugin/src/ui/data-table/DataTableManager.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/TableContextMenu.tsx b/desktop/flipper-plugin/src/ui/data-table/TableContextMenu.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/TableContextMenu.tsx
rename to desktop/flipper-plugin/src/ui/data-table/TableContextMenu.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/TableHead.tsx b/desktop/flipper-plugin/src/ui/data-table/TableHead.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/TableHead.tsx
rename to desktop/flipper-plugin/src/ui/data-table/TableHead.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/TableRow.tsx b/desktop/flipper-plugin/src/ui/data-table/TableRow.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/TableRow.tsx
rename to desktop/flipper-plugin/src/ui/data-table/TableRow.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/TableSearch.tsx b/desktop/flipper-plugin/src/ui/data-table/TableSearch.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/TableSearch.tsx
rename to desktop/flipper-plugin/src/ui/data-table/TableSearch.tsx
diff --git a/desktop/flipper-plugin/src/ui/datatable/__tests__/DataTable.node.tsx b/desktop/flipper-plugin/src/ui/data-table/__tests__/DataTable.node.tsx
similarity index 96%
rename from desktop/flipper-plugin/src/ui/datatable/__tests__/DataTable.node.tsx
rename to desktop/flipper-plugin/src/ui/data-table/__tests__/DataTable.node.tsx
index 381244b7e..38915375a 100644
--- a/desktop/flipper-plugin/src/ui/datatable/__tests__/DataTable.node.tsx
+++ b/desktop/flipper-plugin/src/ui/data-table/__tests__/DataTable.node.tsx
@@ -55,15 +55,15 @@ test('update and append', async () => {
     expect(elem.length).toBe(1);
     expect(elem[0].parentElement).toMatchInlineSnapshot(`
       <div
-        class="css-1b7miqb-TableBodyRowContainer efe0za01"
+        class="css-w3o588-TableBodyRowContainer e1luu51r1"
       >
         <div
-          class="css-1xxqqu6-TableBodyColumnContainer efe0za00"
+          class="css-1xxqqu6-TableBodyColumnContainer e1luu51r0"
         >
           test DataTable
         </div>
         <div
-          class="css-1xxqqu6-TableBodyColumnContainer efe0za00"
+          class="css-1xxqqu6-TableBodyColumnContainer e1luu51r0"
         >
           true
         </div>
@@ -112,15 +112,15 @@ test('column visibility', async () => {
     expect(elem.length).toBe(1);
     expect(elem[0].parentElement).toMatchInlineSnapshot(`
       <div
-        class="css-1b7miqb-TableBodyRowContainer efe0za01"
+        class="css-w3o588-TableBodyRowContainer e1luu51r1"
       >
         <div
-          class="css-1xxqqu6-TableBodyColumnContainer efe0za00"
+          class="css-1xxqqu6-TableBodyColumnContainer e1luu51r0"
         >
           test DataTable
         </div>
         <div
-          class="css-1xxqqu6-TableBodyColumnContainer efe0za00"
+          class="css-1xxqqu6-TableBodyColumnContainer e1luu51r0"
         >
           true
         </div>
@@ -137,10 +137,10 @@ test('column visibility', async () => {
     expect(elem.length).toBe(1);
     expect(elem[0].parentElement).toMatchInlineSnapshot(`
       <div
-        class="css-1b7miqb-TableBodyRowContainer efe0za01"
+        class="css-w3o588-TableBodyRowContainer e1luu51r1"
       >
         <div
-          class="css-1xxqqu6-TableBodyColumnContainer efe0za00"
+          class="css-1xxqqu6-TableBodyColumnContainer e1luu51r0"
         >
           test DataTable
         </div>
diff --git a/desktop/flipper-plugin/src/ui/datatable/__tests__/DataTableManager.node.tsx b/desktop/flipper-plugin/src/ui/data-table/__tests__/DataTableManager.node.tsx
similarity index 100%
rename from desktop/flipper-plugin/src/ui/datatable/__tests__/DataTableManager.node.tsx
rename to desktop/flipper-plugin/src/ui/data-table/__tests__/DataTableManager.node.tsx