diff --git a/src/components/DataDisplay/classNames.ts b/src/components/DataDisplay/classNames.ts
index 15f00b3b..fa170f92 100644
--- a/src/components/DataDisplay/classNames.ts
+++ b/src/components/DataDisplay/classNames.ts
@@ -1,17 +1,23 @@
-export const itemDetailsClassNames = {
-  itemDetails: "item-details",
-  container: "item-details-container",
-  header: "item-details-header",
-  content: "item-details-content",
-
-  itemDetailsGroup: "item-details-group",
-  groupContainer: "item-details-group-container",
-  groupHeader: "item-details-group-header",
-  groupContent: "item-details-group-content",
-
+/**
+ * Class names for `DataDisplay` components (src/components/DataDisplay/).
+ */
+export const dataDisplayClassNames = {
+  // ItemDetails
+  root: "item-details__root",
+  header: "item-details__header",
+  content: "item-details__content",
+  // ItemDetailsGroup
+  groupRoot: "item-details-group__root",
+  groupHeader: "item-details-group__header",
+  groupContent: "item-details-group__content",
+  // ItemDetailsHeader
   label: "item-details-label",
-
+  // LocationDetails
   locationDetails: "location-details",
-  locationDetailsAddressText: "location-details-address-text",
-  locationDetailsMapAnchor: "location-details-map-anchor",
-};
+  locationDetailsAddressText: "location-details__address-text",
+  locationDetailsMapAnchor: "location-details__map-anchor",
+  // InvoiceWorkOrderDetails
+  invoiceWorkOrderDetailsRoot: "invoice-work-order-details__root",
+  // HelpInfoIcon
+  helpInfoIcon: "help-info-icon",
+} as const;
diff --git a/src/components/DataDisplay/index.ts b/src/components/DataDisplay/index.ts
index cb0ee4db..181b2c83 100644
--- a/src/components/DataDisplay/index.ts
+++ b/src/components/DataDisplay/index.ts
@@ -1,2 +1,8 @@
+export * from "./ItemDetails";
+export * from "./ItemDetailsGroup";
+
+export * from "./HelpInfoIcon";
+export * from "./InvoiceWorkOrderDetails";
+export * from "./LocationDetails";
+
 export * from "./classNames";
-export * from "./types";