diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix
index 267189a..4666df0 100644
--- a/modules/home/services/mpd/default.nix
+++ b/modules/home/services/mpd/default.nix
@@ -3,8 +3,8 @@
   services.mpd = {
     enable = config.home.desktop.enable;
     network.startWhenNeeded = true;
-    musicDirectory = "/home/${config.home.username}/KittyNFS/Music/JimBops";
-    playlistDirectory = "/home/${config.home.username}/KittyNFS/Music/JimBops/Playlists";
+    musicDirectory = "/home/${config.home.username}/KittyNFS/Music/NixBops";
+    playlistDirectory = "/home/${config.home.username}/KittyNFS/Music/NixBops/Playlists";
     extraConfig = ''
       audio_output {
         type "pipewire"
diff --git a/modules/system/services/server/icecast/liquidsoap/default.nix b/modules/system/services/server/icecast/liquidsoap/default.nix
index 87be74d..3693261 100644
--- a/modules/system/services/server/icecast/liquidsoap/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/default.nix
@@ -1,7 +1,7 @@
 { ... }:
 {
   imports = [
-    ./jimbops
-    ./jimscrapped
+    ./nixbops
+    ./nixscrap
   ];
 }
diff --git a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix b/modules/system/services/server/icecast/liquidsoap/nixbops/default.nix
similarity index 79%
rename from modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
rename to modules/system/services/server/icecast/liquidsoap/nixbops/default.nix
index a7e6d00..75eab16 100644
--- a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/nixbops/default.nix
@@ -2,12 +2,12 @@
 {
   config = lib.mkIf config.services.icecast.enable {
     services.liquidsoap.streams = {
-      jimbops = pkgs.writeText "jimbops" ''
+      nixbops = pkgs.writeText "nixbops" ''
         settings.log.stdout.set(true)
         settings.init.allow_root.set(true)
         settings.scheduler.fast_queues.set(2)
         
-        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/JimBops"))
+        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/NixBops"))
         stream_fallback = fallback([stream, stream])
         
         output.icecast(
@@ -17,10 +17,10 @@
           password="${config.secrets.castSourcePass}",
           encoding = "UTF-8",
 
-          name="JimBops Radio",
+          name="NixBops Radio",
           genre="Anything",
-          description="Music gathered by me, Jimbo.",
-          mount="jimbops.opus",
+          description="Random collection of downloaded music.",
+          mount="nixbops.opus",
           icy_metadata=["artist", "title"],
           public=true,
 
@@ -30,7 +30,7 @@
     };
 
     # Avoid the most stupid error imaginable
-    systemd.services.jimbops = {
+    systemd.services.nixbops = {
       after = [ "network-online.target" ];
       wants = [ "network-online.target" ];
     };
diff --git a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix b/modules/system/services/server/icecast/liquidsoap/nixscrap/default.nix
similarity index 82%
rename from modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
rename to modules/system/services/server/icecast/liquidsoap/nixscrap/default.nix
index 78919de..c3025be 100644
--- a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/nixscrap/default.nix
@@ -2,12 +2,12 @@
 {
   config = lib.mkIf config.services.icecast.enable {
     services.liquidsoap.streams = {
-      jimscrapped = pkgs.writeText "jimscrapped" ''
+      nixscrap = pkgs.writeText "nixscrap" ''
         settings.log.stdout.set(true)
         settings.init.allow_root.set(true)
         settings.scheduler.fast_queues.set(2)
         
-        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/JimScrapped"))
+        stream = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/KittyNFS/Music/Scrap"))
         stream_fallback = fallback([stream, stream])
         
         output.icecast(
@@ -17,10 +17,10 @@
           password="${config.secrets.castSourcePass}",
           encoding = "UTF-8",
 
-          name="Jimbo's Scrap",
+          name="Nixbops Scrap",
           genre="Scrapped",
           description="Music canned from the main radio.",
-          mount="jimscrapped.opus",
+          mount="nixscrap.opus",
           icy_metadata=["artist", "title"],
           public=true,
 
@@ -30,7 +30,7 @@
     };
 
     # Avoid the most stupid error imaginable
-    systemd.services.jimscrapped = {
+    systemd.services.nixscrap = {
       after = [ "network-online.target" ];
       wants = [ "network-online.target" ];
     };