diff --git a/src/lib/assets/layouts/t4g.layout.yml b/src/lib/assets/layouts/ccb.layout.yml
similarity index 94%
rename from src/lib/assets/layouts/t4g.layout.yml
rename to src/lib/assets/layouts/ccb.layout.yml
index 420c0604..5f600b43 100644
--- a/src/lib/assets/layouts/t4g.layout.yml
+++ b/src/lib/assets/layouts/ccb.layout.yml
@@ -1,4 +1,4 @@
-name: T4G
+name: CCB
 col:
   - row:
       - switch: { e: 3, n: 5, w: 4, s: 6 }
diff --git a/src/lib/components/layout/Layout.svelte b/src/lib/components/layout/Layout.svelte
index ff89fd68..bbdad57c 100644
--- a/src/lib/components/layout/Layout.svelte
+++ b/src/lib/components/layout/Layout.svelte
@@ -36,8 +36,8 @@
       import("$lib/assets/layouts/m4gr.layout.yml").then(
         (it) => it.default as CompiledLayout,
       ),
-    T4G: () =>
-      import("$lib/assets/layouts/t4g.layout.yml").then(
+    CCB: () =>
+      import("$lib/assets/layouts/ccb.layout.yml").then(
         (it) => it.default as CompiledLayout,
       ),
   };
diff --git a/src/lib/serial/device.ts b/src/lib/serial/device.ts
index 9f77419f..561017c8 100644
--- a/src/lib/serial/device.ts
+++ b/src/lib/serial/device.ts
@@ -19,7 +19,7 @@ export const PORT_FILTERS: Map<string, SerialPortFilter> = new Map([
   ["X", { usbProductId: 0x818b, usbVendorId: 0x303a }],
   ["M4G S3 (pre-production)", { usbProductId: 0x1001, usbVendorId: 0x303a }],
   ["M4G S3", { usbProductId: 0x829a, usbVendorId: 0x303a }],
-  ["T4G S2", { usbProductId: 0x82f2, usbVendorId: 0x303a }],
+  ["CCB S2", { usbProductId: 0x82f2, usbVendorId: 0x303a }],
 ]);
 
 const DEVICE_ALIASES = new Map<string, Set<string>>([
@@ -30,7 +30,7 @@ const DEVICE_ALIASES = new Map<string, Set<string>>([
   ["CCX", new Set(["X", "ccx"])],
   ["M4G", new Set(["M4G S3", "m4g_s3", "M4G S3 (pre-production)"])],
   ["M4G (right)", new Set(["M4GR S3", "m4gr_s3"])],
-  ["T4G", new Set(["T4G S2", "t4g_s2"])],
+  ["CCB", new Set(["T4G S2", "t4g_s2", "CCB S2", "ccb s2"])],
 ]);
 
 export function getName(alias: string): string {
@@ -67,6 +67,7 @@ const KEY_COUNTS = {
   M4G: 90,
   M4GR: 90,
   T4G: 7,
+  CCB: 7,
   ZERO: 256,
 } as const;