Index: src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua
===================================================================
--- src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua	(revision 8519)
+++ src/squeezeplay/share/applets/ChooseMusicSource/ChooseMusicSourceApplet.lua	(working copy)
@@ -44,6 +44,8 @@
 local Icon          = require("jive.ui.Icon")
 local SlimServer    = require("jive.slim.SlimServer")
 
+local hasNetworking, Networking = pcall(require, "jive.net.Networking")
+
 local debug         = require("jive.utils.debug")
 local iconbar       = iconbar
 
@@ -96,6 +98,14 @@
 	self.ignoreServerConnected = ignoreServerConnected
 	self.confirmOnChange = confirmOnChange
 	self.offerSn = offerSn
+	self.localIp = nil
+
+	if hasNetworking then
+		local ifObj = Networking:activeInterface()
+		if ifObj then
+			self.localIp = Networking:getIP(ifObj)
+		end
+	end
 
 	if specificServer then
 		log:debug("selecting specific server ", specificServer)
@@ -286,6 +296,17 @@
                 	end,
 			weight = 1,
 		}
+		
+		if id == self.localIp then
+			-- get the media type we're using ("SD" or "USB")
+			local mediaName = appletManager:callService("getSqueezecenterMediaType")
+			
+			log:debug("Adding media name to local server name: " .. mediaName)
+			
+			if mediaName then
+				item.text = item.text .. " (" .. mediaName .. ")"
+			end
+		end
 
 		self.serverMenu:addItem(item)
 		self.serverList[id] = item
Index: src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua
===================================================================
--- src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua	(revision 8519)
+++ src/squeezeplay/share/applets/SlimMenus/SlimMenusApplet.lua	(working copy)
@@ -849,8 +849,11 @@
 end
 
 
-function _updateMyMusicTitle(self, serverName)
+function _updateMyMusicTitle(self, server)
 	local myMusicNode = jiveMain:getMenuTable()["_myMusic"]
+	
+	local serverName = server and server.name or nil
+	
 	if not myMusicNode.originalNodeText then
 		myMusicNode.originalNodeText = myMusicNode.text
 		--todo: this doesn't handle on-the-fly language change well
@@ -859,6 +862,17 @@
 	if not serverName or serverName == "mysqueezebox.com" then
 		myMusicNode.text = myMusicNode.originalNodeText
 	else
+		-- if this is embedded server, add the music collection's media to the name
+		if server and server:isEmbedded() then
+			-- get the media type we're using ("SD" or "USB")
+			local mediaName = appletManager:callService("getSqueezecenterMediaType")
+			log:debug("Adding media name to local server name: " .. mediaName)
+			
+			if mediaName then
+				serverName = serverName .. " (" .. mediaName .. ")"
+			end
+		end
+
 		myMusicNode.text =  serverName
 	end
 end
@@ -1061,7 +1075,7 @@
 				_server = player:getSlimServer()
 
 				local playerName = _player:getName()
-				self:_updateMyMusicTitle(_server and _server.name or nil)
+				self:_updateMyMusicTitle(_server)
 
 				jiveMain:setTitle(playerName)
 
@@ -1156,7 +1170,7 @@
 
 		local playerName = _player:getName()
 --		playerName = self:_addServerNameToHomeTitle(playerName)
-		self:_updateMyMusicTitle(_server.name)
+		self:_updateMyMusicTitle(_server)
 
 		jiveMain:setTitle(playerName)
 
Index: src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua
===================================================================
--- src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua	(revision 8519)
+++ src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterApplet.lua	(working copy)
@@ -370,6 +370,20 @@
 	return false
 end
 
+function getSqueezecenterMediaType(self)
+	local scDrive = self:_scDrive()
+	
+	if scDrive then
+		local devName = string.match(scDrive, "/media/(%w*)")
+		
+		if devName then
+			return tostring(self:string(self:mediaType(devName)))
+		end
+	end
+
+	return nil
+end
+
 -- _mountingDrive
 -- full screen popup that appears until mounting is complete or failed
 ---function _mountingDrive(self)
Index: src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua
===================================================================
--- src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua	(revision 8519)
+++ src/squeezeplay_fab4/share/applets/SqueezeCenter/SqueezeCenterMeta.lua	(working copy)
@@ -29,6 +29,7 @@
 	meta:registerService("squeezecenterStartupCheck")
 	meta:registerService("isBuiltInSCRunning")
 	meta:registerService("stopSqueezeCenter")
+	meta:registerService("getSqueezecenterMediaType")
 end
 
 function configureApplet(meta)