Index: /Users/mh/Documents/workspace/Boom/server/Slim/Control/Commands.pm
===================================================================
--- /Users/mh/Documents/workspace/Boom/server/Slim/Control/Commands.pm	(revision 22786)
+++ /Users/mh/Documents/workspace/Boom/server/Slim/Control/Commands.pm	(working copy)
@@ -1239,7 +1239,7 @@
 	# this avoids rescanning items already in the database and allows playlist and other favorites to be played
 	
 	# XXX: hardcoding these protocols isn't the best way to do this. We should have a flag in ProtocolHandler to get this list
-	if ($path =~ /^file:\/\/|^db:|^itunesplaylist:|^musicmagicplaylist:/) {
+	if ($path =~ /^file:\/\/|^db:|^itunesplaylist:|^musicipplaylist:/) {
 
 		if (my @tracks = _playlistXtracksCommand_parseDbItem($client, $path)) {
 
Index: /Users/mh/Documents/workspace/Boom/server/Slim/Music/Info.pm
===================================================================
--- /Users/mh/Documents/workspace/Boom/server/Slim/Music/Info.pm	(revision 22786)
+++ /Users/mh/Documents/workspace/Boom/server/Slim/Music/Info.pm	(working copy)
@@ -1029,7 +1029,7 @@
 			# Backwards-compat for handlers without a handler class
 			
 			# Special case a few of our internal protocols that aren't remote
-			if ( $proto =~ /^(?:db|itunesplaylist|musicmagicplaylist)$/ ) {
+			if ( $proto =~ /^(?:db|itunesplaylist|musicipplaylist)$/ ) {
 				return 0;
 			}
 			
Index: /Users/mh/Documents/workspace/Boom/server/Slim/Plugin/MusicMagic/Importer.pm
===================================================================
--- /Users/mh/Documents/workspace/Boom/server/Slim/Plugin/MusicMagic/Importer.pm	(revision 22786)
+++ /Users/mh/Documents/workspace/Boom/server/Slim/Plugin/MusicMagic/Importer.pm	(working copy)
@@ -109,7 +109,7 @@
 			'use'          => $prefs->get('musicip'),
 		});
 
-		Slim::Player::ProtocolHandlers->registerHandler('musicmagicplaylist', 0);
+		Slim::Player::ProtocolHandlers->registerHandler('musicipplaylist', 0);
 
 	} else {
 
@@ -398,7 +398,7 @@
 	}
 
 	my %attributes = ();
-	my $url        = 'musicmagicplaylist:' . Slim::Utils::Misc::escape($name);
+	my $url        = 'musicipplaylist:' . Slim::Utils::Misc::escape($name);
 
 	# add this list of duplicates to our playlist library
 	$attributes{'TITLE'} = join('', 
Index: /Users/mh/Documents/workspace/Boom/server/Slim/Plugin/MusicMagic/Plugin.pm
===================================================================
--- /Users/mh/Documents/workspace/Boom/server/Slim/Plugin/MusicMagic/Plugin.pm	(revision 22786)
+++ /Users/mh/Documents/workspace/Boom/server/Slim/Plugin/MusicMagic/Plugin.pm	(working copy)
@@ -112,7 +112,7 @@
 	Slim::Utils::Timers::killTimers(undef, \&checker);
 
 	# disable protocol handler?
-	Slim::Player::ProtocolHandlers->registerHandler('musicmagicplaylist', 0);
+	Slim::Player::ProtocolHandlers->registerHandler('musicipplaylist', 0);
 
 	$initialized = 0;
 
@@ -199,7 +199,7 @@
 			'contextToken' => 'MUSICMAGIC_MIX',
 		});
 
-		Slim::Player::ProtocolHandlers->registerHandler('musicmagicplaylist', 0);
+		Slim::Player::ProtocolHandlers->registerHandler('musicipplaylist', 0);
 
 		Slim::Plugin::MusicMagic::ClientSettings->new;
 
@@ -1111,7 +1111,7 @@
 			if ($obj->musicmagic_mixable) {
 
 				my $playlist = $obj->path;
-				if ($obj->url =~ /musicmagicplaylist:(.*?)$/) {
+				if ($obj->url =~ /musicipplaylist:(.*?)$/) {
 					$playlist = Slim::Utils::Misc::unescape($1);
 				}
 
Index: /Users/mh/Documents/workspace/Boom/server/types.conf
===================================================================
--- /Users/mh/Documents/workspace/Boom/server/types.conf	(revision 22786)
+++ /Users/mh/Documents/workspace/Boom/server/types.conf	(working copy)
@@ -59,8 +59,8 @@
 #ID     Prefix                  Mime Content-Type           Server File Type#
 #########################################################################
 itu     itunesplaylist:         audio/x-itunesplaylist      playlist
-mmp     musicmagicplaylist:     audio/x-musicmagicplaylist  playlist
-mood    -                       audio/x-musicmagicmood      playlist
+mmp     musicipplaylist:        audio/x-musicipplaylist     playlist
+mood    -                       audio/x-musicipmood         playlist
 ssp     playlist:               audio/x-slimserverplaylist  playlist
 cpl     clientplaylist:         audio/x-slimserverplaylist  playlist
 rnd     -                       audio/x-randomplay          playlist