diff --git a/README.org b/README.org
index 7457ee4..e2becd2 100644
--- a/README.org
+++ b/README.org
@@ -22,7 +22,7 @@ Channel specification:
        "13E7 6CD6 E649 C28C 3385  4DF5 5E5A A665 6149 17F7"))))
 #+end_src
 
-You can use [[https://toys.whereis.social/][Toys]] to search packages, services and public symbols from Rosenthal
+You can use [[https://toys.whereis.social/?search=&channel=rosenthal][Toys]] to search packages, services and public symbols from Rosenthal
 and other Guix channels.
 
 [[https://guix.gnu.org/manual/devel/en/html_node/Substitutes.html][Substitutes]] (pre-built package binaries) for this channel are available via [[https://guix.moe/][Guix
diff --git a/modules/rosenthal/services/bittorrent.scm b/modules/rosenthal/services/bittorrent.scm
index ffe44db..ed4cdc2 100644
--- a/modules/rosenthal/services/bittorrent.scm
+++ b/modules/rosenthal/services/bittorrent.scm
@@ -156,7 +156,7 @@ WebUI\\Password_PBKDF2=\"@ByteArray(ARQ77eY1NUZaQsuDHbIMCA==:0WMRkYTUWVT9wVvdDtH
 
 (define home-qbittorrent-service-type
   (service-type
-   (name 'qbittorrent)
+   (name 'home-qbittorrent)
    (extensions
     (list (service-extension home-activation-service-type
                              (const home-qbittorrent-activation))
diff --git a/modules/rosenthal/services/desktop.scm b/modules/rosenthal/services/desktop.scm
index 55b43dc..4b30b81 100644
--- a/modules/rosenthal/services/desktop.scm
+++ b/modules/rosenthal/services/desktop.scm
@@ -107,7 +107,7 @@
 
 (define home-blueman-applet-service-type
   (service-type
-    (name 'blueman-applet)
+    (name 'home-blueman-applet)
     (extensions
      (list (service-extension home-profile-service-type
                               (compose list home-blueman-applet-configuration-blueman))
@@ -189,7 +189,7 @@
 
 (define home-fcitx5-service-type
   (service-type
-    (name 'fcitx5)
+    (name 'home-fcitx5)
     (extensions
      (list (service-extension home-environment-variables-service-type
                               %home-fcitx5-environment-variables)
@@ -234,7 +234,7 @@
 
 (define home-mako-service-type
   (service-type
-    (name 'mako)
+    (name 'home-mako)
     (extensions
      (list (service-extension home-xdg-configuration-files-service-type
                               %home-mako-xdg-config)
@@ -266,7 +266,7 @@
 
 (define home-network-manager-applet-service-type
   (service-type
-    (name 'network-manager-applet)
+    (name 'home-network-manager-applet)
     (extensions
      (list (service-extension home-profile-service-type
                               (compose list home-network-manager-applet-configuration-network-manager-applet))
@@ -294,7 +294,7 @@
 
 (define home-niri-service-type
   (service-type
-    (name 'niri)
+    (name 'home-niri)
     (extensions
      (list (service-extension home-xdg-configuration-files-service-type
                               %home-niri-xdg-config)))
@@ -328,7 +328,7 @@ compositor.")))
 
 (define home-noctalia-shell-service-type
   (service-type
-    (name 'noctalia-shell)
+    (name 'home-noctalia-shell)
     (extensions
      (list (service-extension home-shepherd-service-type
                               %home-noctalia-shell-shepherd)
@@ -378,7 +378,7 @@ compositor.")))
 
 (define home-rofi-service-type
   (service-type
-    (name 'rofi)
+    (name 'home-rofi)
     (extensions
      (list (service-extension home-xdg-configuration-files-service-type
                               %home-rofi-xdg-config)))
@@ -413,7 +413,7 @@ compositor.")))
 
 (define home-swaybg-service-type
   (service-type
-    (name 'swaybg)
+    (name 'home-swaybg)
     (extensions
      (list (service-extension home-shepherd-service-type
                               %home-swaybg-shepherd)))
@@ -485,7 +485,7 @@ gtk-key-theme-name = ~a~%"
 
 (define home-theme-service-type
   (service-type
-    (name 'theme)
+    (name 'home-theme)
     (extensions
      (list (service-extension home-environment-variables-service-type
                               %home-theme-environment-variables)
@@ -537,7 +537,7 @@ gtk-key-theme-name = ~a~%"
 
 (define home-waybar-service-type
   (service-type
-    (name 'waybar)
+    (name 'home-waybar)
     (extensions
      (list (service-extension home-xdg-configuration-files-service-type
                               %home-waybar-xdg-config)
diff --git a/modules/rosenthal/services/shellutils.scm b/modules/rosenthal/services/shellutils.scm
index a385194..29522bd 100644
--- a/modules/rosenthal/services/shellutils.scm
+++ b/modules/rosenthal/services/shellutils.scm
@@ -59,7 +59,7 @@
 
 (define home-fish-plugin-atuin-service-type
   (service-type
-    (name 'atuin)
+    (name 'home-atuin)
     (extensions
      (list (service-extension home-fish-service-type
                               %home-atuin-fish)))
@@ -93,7 +93,7 @@
 
 (define home-fish-plugin-direnv-service-type
   (service-type
-    (name 'direnv)
+    (name 'home-direnv)
     (extensions
      (list (service-extension home-fish-service-type
                               %home-direnv-fish)))
@@ -127,7 +127,7 @@
 
 (define home-fish-plugin-zoxide-service-type
   (service-type
-    (name 'zoxide)
+    (name 'home-zoxide)
     (extensions
      (list (service-extension home-fish-service-type
                               %home-zoxide-fish)))