diff --git a/buildroot-external/package/spotifyd/spotifyd.conf b/buildroot-external/package/spotifyd/spotifyd.conf
index 704f24f4..487d06bd 100644
--- a/buildroot-external/package/spotifyd/spotifyd.conf
+++ b/buildroot-external/package/spotifyd/spotifyd.conf
@@ -11,4 +11,4 @@ zeroconf_port = 57621
 backend = pulseaudio
 
 # Name in Spotify Connect, cannot contain spaces:
-device_name = MycroftOS-Spotify
+device_name = MycroftOS
diff --git a/buildroot-external/rootfs-overlay/etc/shairport-sync.conf b/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
index 74885516..dbf23cef 100644
--- a/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
+++ b/buildroot-external/rootfs-overlay/etc/shairport-sync.conf
@@ -1,4 +1,4 @@
 general = {
-  name = "MycroftOS-Airplay";
+  name = "MycroftOS";
   output_backend = "pa";
 };