diff --git a/supacode/Clients/Shortcuts/CustomShortcutRegistryClient.swift b/supacode/Clients/Shortcuts/CustomShortcutRegistryClient.swift
index a47a88c9..2b29a7b9 100644
--- a/supacode/Clients/Shortcuts/CustomShortcutRegistryClient.swift
+++ b/supacode/Clients/Shortcuts/CustomShortcutRegistryClient.swift
@@ -7,7 +7,7 @@ struct CustomShortcutRegistryClient {
 extension CustomShortcutRegistryClient: DependencyKey {
   static let liveValue = Self(
     setShortcuts: { shortcuts in
-      OnevcatCustomShortcutRegistry.shared.setShortcuts(shortcuts)
+      UserCustomShortcutRegistry.shared.setShortcuts(shortcuts)
     }
   )
 
diff --git a/supacode/Infrastructure/Ghostty/GhosttySurfaceView.swift b/supacode/Infrastructure/Ghostty/GhosttySurfaceView.swift
index 0aab8e68..0ff19ff3 100644
--- a/supacode/Infrastructure/Ghostty/GhosttySurfaceView.swift
+++ b/supacode/Infrastructure/Ghostty/GhosttySurfaceView.swift
@@ -984,7 +984,7 @@ final class GhosttySurfaceView: NSView, Identifiable {
     guard let surface else { return false }
     guard focused else { return false }
 
-    if OnevcatCustomShortcutRegistry.shared.matches(event: event),
+    if UserCustomShortcutRegistry.shared.matches(event: event),
       let menu = NSApp.mainMenu,
       menu.performKeyEquivalent(with: event)
     {
diff --git a/supacode/Infrastructure/Ghostty/OnevcatCustomShortcutRegistry.swift b/supacode/Infrastructure/Ghostty/UserCustomShortcutRegistry.swift
similarity index 84%
rename from supacode/Infrastructure/Ghostty/OnevcatCustomShortcutRegistry.swift
rename to supacode/Infrastructure/Ghostty/UserCustomShortcutRegistry.swift
index 539efb25..bcd96c47 100644
--- a/supacode/Infrastructure/Ghostty/OnevcatCustomShortcutRegistry.swift
+++ b/supacode/Infrastructure/Ghostty/UserCustomShortcutRegistry.swift
@@ -1,8 +1,8 @@
 import AppKit
 
 @MainActor
-final class OnevcatCustomShortcutRegistry {
-  static let shared = OnevcatCustomShortcutRegistry()
+final class UserCustomShortcutRegistry {
+  static let shared = UserCustomShortcutRegistry()
 
   private var shortcuts: [UserCustomShortcut] = []