diff --git a/packages/canon/src/components/Flex/Flex.props.ts b/packages/canon/src/components/Flex/Flex.props.ts
index 97a602b42f..b1d9c019d3 100644
--- a/packages/canon/src/components/Flex/Flex.props.ts
+++ b/packages/canon/src/components/Flex/Flex.props.ts
@@ -29,19 +29,19 @@ const justifyValues = ['start', 'center', 'end', 'between'] as const;
 const flexPropDefs = {
   align: {
     type: 'enum',
-    className: 'cu-align',
+    className: 'bui-align',
     values: alignValues,
     responsive: true,
   },
   direction: {
     type: 'enum',
-    className: 'cu-fd',
+    className: 'bui-fd',
     values: directionValues,
     responsive: true,
   },
   justify: {
     type: 'enum',
-    className: 'cu-jc',
+    className: 'bui-jc',
     values: justifyValues,
     responsive: true,
   },
diff --git a/packages/canon/src/components/Grid/Grid.props.ts b/packages/canon/src/components/Grid/Grid.props.ts
index a918af6187..b6997cb01b 100644
--- a/packages/canon/src/components/Grid/Grid.props.ts
+++ b/packages/canon/src/components/Grid/Grid.props.ts
@@ -36,7 +36,7 @@ const columnsValues = [
 const gridPropDefs = {
   columns: {
     type: 'enum | string',
-    className: 'cu-columns',
+    className: 'bui-columns',
     customProperties: ['--columns'],
     values: columnsValues,
     responsive: true,
@@ -50,28 +50,28 @@ const gridPropDefs = {
 const gridItemPropDefs = {
   colSpan: {
     type: 'enum | string',
-    className: 'cu-col-span',
+    className: 'bui-col-span',
     customProperties: ['--col-span'],
     values: columnsValues,
     responsive: true,
   },
   colEnd: {
     type: 'enum | string',
-    className: 'cu-col-end',
+    className: 'bui-col-end',
     customProperties: ['--col-end'],
     values: columnsValues,
     responsive: true,
   },
   colStart: {
     type: 'enum | string',
-    className: 'cu-col-start',
+    className: 'bui-col-start',
     customProperties: ['--col-start'],
     values: columnsValues,
     responsive: true,
   },
   rowSpan: {
     type: 'enum | string',
-    className: 'cu-row-span',
+    className: 'bui-row-span',
     customProperties: ['--row-span'],
     values: columnsValues,
     responsive: true,