diff --git a/bin/omarchy-menu-clipboard b/bin/omarchy-menu-clipboard
index 0971c4af..83a6b557 100755
--- a/bin/omarchy-menu-clipboard
+++ b/bin/omarchy-menu-clipboard
@@ -3,4 +3,4 @@
 # omarchy:group=menu
 # omarchy:examples=omarchy menu clipboard
 
-omarchy-shell shell toggle omarchy.clipboard-picker "{}"
+omarchy-shell shell toggle omarchy.clipboard
diff --git a/default/hypr/apps/omarchy-shell.lua b/default/hypr/apps/omarchy-shell.lua
index eb2c4238..86126d26 100644
--- a/default/hypr/apps/omarchy-shell.lua
+++ b/default/hypr/apps/omarchy-shell.lua
@@ -6,7 +6,7 @@
 hl.layer_rule({ match = { namespace = "omarchy-bar" }, no_anim = true, animation = "none" })
 
 -- Launcher, image selector, emoji picker, and clipboard overlays should also pop without animation.
-hl.layer_rule({ match = { namespace = "^(omarchy-menu|omarchy-launcher|omarchy-image-selector|omarchy-emoji-picker|omarchy-clipboard-picker)$" }, no_anim = true, animation = "none" })
+hl.layer_rule({ match = { namespace = "^(omarchy-menu|omarchy-launcher|omarchy-image-selector|omarchy-emoji-picker|omarchy-clipboard)$" }, no_anim = true, animation = "none" })
 
 -- Bar settings floats centered with a sensible default size instead of
 -- tiling — it's a transient dialog, not a workspace surface.
diff --git a/default/hypr/bindings/clipboard.lua b/default/hypr/bindings/clipboard.lua
index cd3256a5..2f4d1331 100644
--- a/default/hypr/bindings/clipboard.lua
+++ b/default/hypr/bindings/clipboard.lua
@@ -13,4 +13,4 @@ end
 o.bind("SUPER + C", "Universal copy", send_shortcut_once("CTRL", "Insert"))
 o.bind("SUPER + V", "Universal paste", send_shortcut_once("SHIFT", "Insert"))
 o.bind("SUPER + X", "Universal cut", send_shortcut_once("CTRL", "X"))
-o.bind("SUPER + CTRL + V", "Clipboard manager", "omarchy-shell shell toggle omarchy.clipboard-picker \"{}\"")
+o.bind("SUPER + CTRL + V", "Clipboard manager", "omarchy-shell shell toggle omarchy.clipboard")
diff --git a/migrations/1779277899.sh b/migrations/1779277899.sh
index 5309ab11..c3cb6763 100644
--- a/migrations/1779277899.sh
+++ b/migrations/1779277899.sh
@@ -13,8 +13,10 @@ for config_file in "${config_files[@]}"; do
     sed -i \
       -e 's/omarchy\.app-launcher/omarchy.launcher/g' \
       -e 's/omarchy\.battery-monitor/omarchy.battery/g' \
+      -e 's/omarchy\.clipboard-picker/omarchy.clipboard/g' \
       -e 's/omarchy-app-launcher/omarchy-launcher/g' \
       -e 's/omarchy-battery-monitor/omarchy-battery/g' \
+      -e 's/omarchy-clipboard-picker/omarchy-clipboard/g' \
       -e 's/\[app-launcher\]/[launcher]/g' \
       -e 's/app-launcher\./launcher./g' \
       "$config_file"
diff --git a/shell/plugins/README.md b/shell/plugins/README.md
index c1bf80b9..85b2480b 100644
--- a/shell/plugins/README.md
+++ b/shell/plugins/README.md
@@ -16,7 +16,7 @@ User-installed plugins live alongside these conceptually but on disk under
 | Launcher      | `omarchy.launcher`        | `overlay` | `launcher/Launcher.qml`               |
 | Image picker  | `omarchy.image-picker`    | `overlay` | `image-picker/ImagePicker.qml`        |
 | Emoji picker  | `omarchy.emoji-picker`    | `overlay` | `emoji-picker/EmojiPicker.qml`        |
-| Clipboard mgr | `omarchy.clipboard-picker`| `overlay` | `clipboard-picker/ClipboardPicker.qml`|
+| Clipboard mgr | `omarchy.clipboard`       | `overlay` | `clipboard/Clipboard.qml`             |
 | Omarchy menu  | `omarchy.menu`            | `menu`    | `menu/Menu.qml`                       |
 | Notifications | `omarchy.notifications`   | `service` | `notifications/Service.qml`           |
 | Battery       | `omarchy.battery`         | `service` | `services/battery/Service.qml`        |
diff --git a/shell/plugins/clipboard-picker/ClipboardPicker.qml b/shell/plugins/clipboard/Clipboard.qml
similarity index 99%
rename from shell/plugins/clipboard-picker/ClipboardPicker.qml
rename to shell/plugins/clipboard/Clipboard.qml
index 4089423f..7cdcdb9e 100644
--- a/shell/plugins/clipboard-picker/ClipboardPicker.qml
+++ b/shell/plugins/clipboard/Clipboard.qml
@@ -17,7 +17,7 @@ Item {
   property string historyPath: Quickshell.env("HOME") + "/.local/state/omarchy/clipboard-history.json"
   property string captureScript: root.omarchyPath + "/shell/scripts/clipboard-capture.sh"
   // Shares the [menu] surface tokens — themes that style the menu also
-  // style the clipboard picker. Selected-row colors composed in the
+  // style the clipboard. Selected-row colors composed in the
   // singleton so consumers drop them straight into Rectangle bindings.
   property color background: Color.menu.background
   property color foreground: Color.menu.text
@@ -241,7 +241,7 @@ Item {
     visible: root.opened
     anchors { top: true; bottom: true; left: true; right: true }
     color: "transparent"
-    WlrLayershell.namespace: "omarchy-clipboard-picker"
+    WlrLayershell.namespace: "omarchy-clipboard"
     WlrLayershell.layer: WlrLayer.Overlay
     WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
     exclusionMode: ExclusionMode.Ignore
diff --git a/shell/plugins/clipboard-picker/manifest.json b/shell/plugins/clipboard/manifest.json
similarity index 67%
rename from shell/plugins/clipboard-picker/manifest.json
rename to shell/plugins/clipboard/manifest.json
index 0ea048f7..ba366b8f 100644
--- a/shell/plugins/clipboard-picker/manifest.json
+++ b/shell/plugins/clipboard/manifest.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "id": "omarchy.clipboard-picker",
-  "name": "Clipboard picker",
+  "id": "omarchy.clipboard",
+  "name": "Clipboard",
   "version": "1.0.0",
   "author": "Omarchy",
   "description": "A clipboard manager to view and paste history",
@@ -10,6 +10,6 @@
   ],
   "keepLoaded": true,
   "entryPoints": {
-    "overlay": "ClipboardPicker.qml"
+    "overlay": "Clipboard.qml"
   }
 }