diff --git a/src/kits/media/DataExchange.cpp b/src/kits/media/DataExchange.cpp
index 92edb7512b..657851eccb 100644
--- a/src/kits/media/DataExchange.cpp
+++ b/src/kits/media/DataExchange.cpp
@@ -11,7 +11,7 @@
 #include "PortPool.h"
 #include "MediaMisc.h"
 #include "DataExchange.h"
-#include "ServerInterface.h" // NEW_MEDIA_SERVER_SIGNATURE
+#include "ServerInterface.h"
 
 #define TIMEOUT 15000000 // 15 seconds timeout!
 
@@ -30,7 +30,7 @@ void find_media_server_port();
 void find_media_addon_server_port();
 
 static BMessenger * GetMediaServerMessenger() {
-	static BMessenger * messenger = new BMessenger(NEW_MEDIA_SERVER_SIGNATURE);
+	static BMessenger * messenger = new BMessenger(B_MEDIA_SERVER_SIGNATURE);
 	return MediaServerMessenger = messenger;
 }
 
diff --git a/src/kits/media/MediaDefs.cpp b/src/kits/media/MediaDefs.cpp
index f311fb0c79..cf748ac30d 100644
--- a/src/kits/media/MediaDefs.cpp
+++ b/src/kits/media/MediaDefs.cpp
@@ -1004,8 +1004,8 @@ status_t get_next_file_format(int32 *cookie, media_file_format *mfi)
  *************************************************************/
 
 // final & verified
-const char * B_MEDIA_SERVER_SIGNATURE = "application/x-vnd.OpenBeOS-media-server";
-const char * B_MEDIA_ADDON_SERVER_SIGNATURE = "application/x-vnd.OpenBeOS-addon-host";
+const char * B_MEDIA_SERVER_SIGNATURE = "application/x-vnd.Be.media-server";
+const char * B_MEDIA_ADDON_SERVER_SIGNATURE = "application/x-vnd.Be.addon-host";
 
 const type_code B_CODEC_TYPE_INFO = 0x040807b2;