diff --git a/src/apps/cortex/AddOnHost/Jamfile b/src/apps/cortex/AddOnHost/Jamfile
index 811eccd15f..4d2024583b 100644
--- a/src/apps/cortex/AddOnHost/Jamfile
+++ b/src/apps/cortex/AddOnHost/Jamfile
@@ -12,7 +12,7 @@ Application CortexAddOnHost :
 ;
 
 DoCatalogs CortexAddOnHost :
-	application/x-vnd.Cortex.AddOnHost
+	x-vnd.Cortex.AddOnHost
 	:
 	AddOnHostApp.cpp
 ;
diff --git a/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp b/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp
index 6beb817313..95fe004610 100644
--- a/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp
+++ b/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp
@@ -63,7 +63,7 @@ __USE_CORTEX_NAMESPACE
 #define D_OPERATION(x) //PRINT (x)	// operations
 #define D_COMPARE(x) //PRINT (x)	// compare functions
 
-static BCatalog sCatalog("application/x-vnd.Cortex.DormantNodeView");
+static BCatalog sCatalog("x-vnd.Cortex.DormantNodeView");
 
 // -------------------------------------------------------- //
 // constants
diff --git a/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp b/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp
index 091ffbf9cb..05dea338cc 100644
--- a/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp
+++ b/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp
@@ -59,7 +59,7 @@ __USE_CORTEX_NAMESPACE
 #define D_MESSAGE(x) //PRINT (x)	// MessageReceived()
 #define D_INTERNAL(x) //PRINT (x)	// internal operations
 
-static BCatalog sCatalog("application/x-vnd.Cortex.DormantNodeView");
+static BCatalog sCatalog("x-vnd.Cortex.DormantNodeView");
 
 // -------------------------------------------------------- //
 // constants
diff --git a/src/apps/cortex/DormantNodeView/Jamfile b/src/apps/cortex/DormantNodeView/Jamfile
index 6880ec9fce..f48d19e653 100644
--- a/src/apps/cortex/DormantNodeView/Jamfile
+++ b/src/apps/cortex/DormantNodeView/Jamfile
@@ -16,7 +16,7 @@ StaticLibrary cortex_dormant_node_view.a :
 ;
 
 DoCatalogs cortex_dormant_node_view.a :
-	application/x-vnd.Cortex.DormantNodeView
+	x-vnd.Cortex.DormantNodeView
 	:
 	DormantNodeListItem.cpp
 	DormantNodeWindow.cpp
diff --git a/src/apps/cortex/InfoView/AppNodeInfoView.cpp b/src/apps/cortex/InfoView/AppNodeInfoView.cpp
index 9756d71c86..cfa93d2d73 100644
--- a/src/apps/cortex/InfoView/AppNodeInfoView.cpp
+++ b/src/apps/cortex/InfoView/AppNodeInfoView.cpp
@@ -61,7 +61,7 @@ __USE_CORTEX_NAMESPACE
 #include <Debug.h>
 #define D_METHOD(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");
+static BCatalog sCatalog("x-vnd.Cortex.InfoView");
 
 // -------------------------------------------------------- //
 // *** ctor/dtor (public)
diff --git a/src/apps/cortex/InfoView/ConnectionInfoView.cpp b/src/apps/cortex/InfoView/ConnectionInfoView.cpp
index 4ffaf55c6b..b6784245fc 100644
--- a/src/apps/cortex/InfoView/ConnectionInfoView.cpp
+++ b/src/apps/cortex/InfoView/ConnectionInfoView.cpp
@@ -56,7 +56,7 @@ __USE_CORTEX_NAMESPACE
 #define D_METHOD(x) //PRINT (x)
 #define D_MESSAGE(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");
+static BCatalog sCatalog("x-vnd.Cortex.InfoView");
 
 // -------------------------------------------------------- //
 // *** ctor/dtor (public)
diff --git a/src/apps/cortex/InfoView/DormantNodeInfoView.cpp b/src/apps/cortex/InfoView/DormantNodeInfoView.cpp
index 4a8f438e06..08596f9f70 100644
--- a/src/apps/cortex/InfoView/DormantNodeInfoView.cpp
+++ b/src/apps/cortex/InfoView/DormantNodeInfoView.cpp
@@ -54,7 +54,7 @@ __USE_CORTEX_NAMESPACE
 #include <Debug.h>
 #define D_METHOD(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");
+static BCatalog sCatalog("x-vnd.Cortex.InfoView");
 
 // -------------------------------------------------------- //
 // *** ctor/dtor (public)
diff --git a/src/apps/cortex/InfoView/EndPointInfoView.cpp b/src/apps/cortex/InfoView/EndPointInfoView.cpp
index a33530836e..cc8cfd021a 100644
--- a/src/apps/cortex/InfoView/EndPointInfoView.cpp
+++ b/src/apps/cortex/InfoView/EndPointInfoView.cpp
@@ -51,7 +51,7 @@ __USE_CORTEX_NAMESPACE
 #include <Debug.h>
 #define D_METHOD(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");
+static BCatalog sCatalog("x-vnd.Cortex.InfoView");
 
 // -------------------------------------------------------- //
 // *** ctor/dtor (public)
diff --git a/src/apps/cortex/InfoView/FileNodeInfoView.cpp b/src/apps/cortex/InfoView/FileNodeInfoView.cpp
index 87b192050d..0805e67e57 100644
--- a/src/apps/cortex/InfoView/FileNodeInfoView.cpp
+++ b/src/apps/cortex/InfoView/FileNodeInfoView.cpp
@@ -53,7 +53,7 @@ __USE_CORTEX_NAMESPACE
 #include <Debug.h>
 #define D_METHOD(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");
+static BCatalog sCatalog("x-vnd.Cortex.InfoView");
 
 // -------------------------------------------------------- //
 // *** ctor/dtor (public)
diff --git a/src/apps/cortex/InfoView/InfoView.cpp b/src/apps/cortex/InfoView/InfoView.cpp
index 0384feedd4..d775547b27 100644
--- a/src/apps/cortex/InfoView/InfoView.cpp
+++ b/src/apps/cortex/InfoView/InfoView.cpp
@@ -63,7 +63,7 @@ __USE_CORTEX_NAMESPACE
 #define D_ACCESS(X) //PRINT (x)			// Accessors
 #define D_METHOD(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");
+static BCatalog sCatalog("x-vnd.Cortex.InfoView");
 
 // -------------------------------------------------------- //
 // *** internal class: _InfoTextField
diff --git a/src/apps/cortex/InfoView/Jamfile b/src/apps/cortex/InfoView/Jamfile
index 3f666abdb4..8f58c858a3 100644
--- a/src/apps/cortex/InfoView/Jamfile
+++ b/src/apps/cortex/InfoView/Jamfile
@@ -19,7 +19,7 @@ StaticLibrary cortex_info_view.a :
 ;
 
 DoCatalogs cortex_info_view.a :
-	application/x-vnd.Cortex.InfoView
+	x-vnd.Cortex.InfoView
 	:
 	AppNodeInfoView.cpp
 	ConnectionInfoView.cpp
diff --git a/src/apps/cortex/InfoView/LiveNodeInfoView.cpp b/src/apps/cortex/InfoView/LiveNodeInfoView.cpp
index d07cfb1748..e0a5a15086 100644
--- a/src/apps/cortex/InfoView/LiveNodeInfoView.cpp
+++ b/src/apps/cortex/InfoView/LiveNodeInfoView.cpp
@@ -61,7 +61,7 @@ __USE_CORTEX_NAMESPACE
 #define D_METHOD(x) //PRINT (x)
 #define D_MESSAGE(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.InfoView");
+static BCatalog sCatalog("x-vnd.Cortex.InfoView");
 
 // -------------------------------------------------------- //
 // *** ctor/dtor (public)
diff --git a/src/apps/cortex/MediaRoutingView/Jamfile b/src/apps/cortex/MediaRoutingView/Jamfile
index 11ef2c384f..ee1b31f40f 100644
--- a/src/apps/cortex/MediaRoutingView/Jamfile
+++ b/src/apps/cortex/MediaRoutingView/Jamfile
@@ -23,7 +23,7 @@ StaticLibrary cortex_media_routing_view.a :
 ;
 
 DoCatalogs cortex_media_routing_view.a :
-	application/x-vnd.Cortex.MediaRoutingView
+	x-vnd.Cortex.MediaRoutingView
 	:
 	MediaJack.cpp
 	MediaNodePanel.cpp
diff --git a/src/apps/cortex/MediaRoutingView/MediaJack.cpp b/src/apps/cortex/MediaRoutingView/MediaJack.cpp
index d0d45c5e4c..9691383fdf 100644
--- a/src/apps/cortex/MediaRoutingView/MediaJack.cpp
+++ b/src/apps/cortex/MediaRoutingView/MediaJack.cpp
@@ -66,7 +66,7 @@ __USE_CORTEX_NAMESPACE
 #define D_DRAW(x) //PRINT (x)
 #define D_MOUSE(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView");
+static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
 
 // -------------------------------------------------------- //
 // constants
diff --git a/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp b/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp
index 89c37cac70..da208e5c97 100644
--- a/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp
+++ b/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp
@@ -79,7 +79,7 @@ __USE_CORTEX_NAMESPACE
 #define D_MESSAGE(x) //PRINT (x)
 #define D_DRAW(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView");
+static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
 
 // -------------------------------------------------------- //
 // constants
diff --git a/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp b/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp
index d16b815a22..0e8c803560 100644
--- a/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp
+++ b/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp
@@ -87,7 +87,7 @@ __USE_CORTEX_NAMESPACE
 #define D_MOUSE(x) //PRINT (x)
 #define D_KEY(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView");
+static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
 
 // ---------------------------------------------------------------- //
 // constants
diff --git a/src/apps/cortex/MediaRoutingView/MediaWire.cpp b/src/apps/cortex/MediaRoutingView/MediaWire.cpp
index c1bec55d7c..a55a075c67 100644
--- a/src/apps/cortex/MediaRoutingView/MediaWire.cpp
+++ b/src/apps/cortex/MediaRoutingView/MediaWire.cpp
@@ -66,7 +66,7 @@ __USE_CORTEX_NAMESPACE
 #define D_DRAW(x) //PRINT (x)
 #define D_MOUSE(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.MediaRoutingView");
+static BCatalog sCatalog("x-vnd.Cortex.MediaRoutingView");
 
 // -------------------------------------------------------- //
 // constants
diff --git a/src/apps/cortex/NodeManager/Jamfile b/src/apps/cortex/NodeManager/Jamfile
index f858d08fb8..aaca239f5a 100644
--- a/src/apps/cortex/NodeManager/Jamfile
+++ b/src/apps/cortex/NodeManager/Jamfile
@@ -16,7 +16,7 @@ StaticLibrary cortex_node_manager.a :
 ;
 
 DoCatalogs cortex_node_manager.a :
-	application/x-vnd.Cortex.NodeManager
+	x-vnd.Cortex.NodeManager
 	:
 	NodeManager.cpp
 ;
diff --git a/src/apps/cortex/NodeManager/NodeManager.cpp b/src/apps/cortex/NodeManager/NodeManager.cpp
index 2f7bd9f5c2..d70997365a 100644
--- a/src/apps/cortex/NodeManager/NodeManager.cpp
+++ b/src/apps/cortex/NodeManager/NodeManager.cpp
@@ -68,7 +68,7 @@ __USE_CORTEX_NAMESPACE
 #define D_ROSTER(x) //PRINT (x)
 #define D_LOCK(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.NodeManager");
+static BCatalog sCatalog("x-vnd.Cortex.NodeManager");
 
 // -------------------------------------------------------- //
 // messaging constants
diff --git a/src/apps/cortex/ParameterView/Jamfile b/src/apps/cortex/ParameterView/Jamfile
index bbf7f491d1..6859d086ce 100644
--- a/src/apps/cortex/ParameterView/Jamfile
+++ b/src/apps/cortex/ParameterView/Jamfile
@@ -13,7 +13,7 @@ StaticLibrary cortex_parameter_view.a :
 ;
 
 DoCatalogs cortex_parameter_view.a :
-	application/x-vnd.Cortex.ParameterView
+	x-vnd.Cortex.ParameterView
 	:
 	ParameterWindow.cpp
 ;
diff --git a/src/apps/cortex/ParameterView/ParameterWindow.cpp b/src/apps/cortex/ParameterView/ParameterWindow.cpp
index ccad86a543..c3d0dcdef3 100644
--- a/src/apps/cortex/ParameterView/ParameterWindow.cpp
+++ b/src/apps/cortex/ParameterView/ParameterWindow.cpp
@@ -70,7 +70,7 @@ __USE_CORTEX_NAMESPACE
 #define D_INTERNAL(x) //PRINT (x)
 #define D_MESSAGE(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.ParameterView");
+static BCatalog sCatalog("x-vnd.Cortex.ParameterView");
 
 // -------------------------------------------------------- //
 // ctor/dtor
diff --git a/src/apps/cortex/RouteApp/Jamfile b/src/apps/cortex/RouteApp/Jamfile
index 96912bd594..88cfa9b2ea 100644
--- a/src/apps/cortex/RouteApp/Jamfile
+++ b/src/apps/cortex/RouteApp/Jamfile
@@ -46,7 +46,7 @@ Application Cortex :
 ;
 
 DoCatalogs Cortex :
-	application/x-vnd.Cortex.Route
+	x-vnd.Cortex.Route
 	:
 	RouteAppNodeManager.cpp
 	RouteWindow.cpp
diff --git a/src/apps/cortex/TipManager/Jamfile b/src/apps/cortex/TipManager/Jamfile
index 44b09493b1..ac45ee0461 100644
--- a/src/apps/cortex/TipManager/Jamfile
+++ b/src/apps/cortex/TipManager/Jamfile
@@ -13,7 +13,7 @@ StaticLibrary cortex_tip_manager.a :
 ;
 
 DoCatalogs cortex_tip_manager.a :
-	application/x-vnd.Cortex.TipManager
+	x-vnd.Cortex.TipManager
 	:
 	TipWindow.cpp
 ;
diff --git a/src/apps/cortex/TipManager/TipWindow.cpp b/src/apps/cortex/TipManager/TipWindow.cpp
index 4ad826cc98..ab50bf8444 100644
--- a/src/apps/cortex/TipManager/TipWindow.cpp
+++ b/src/apps/cortex/TipManager/TipWindow.cpp
@@ -45,7 +45,7 @@
 
 __USE_CORTEX_NAMESPACE
 
-static BCatalog sCatalog("application/x-vnd.Cortex.TipManager");
+static BCatalog sCatalog("x-vnd.Cortex.TipManager");
 
 // -------------------------------------------------------- //
 // *** dtor/ctors
diff --git a/src/apps/cortex/TransportView/Jamfile b/src/apps/cortex/TransportView/Jamfile
index ea7c28733d..7f39e3da3a 100644
--- a/src/apps/cortex/TransportView/Jamfile
+++ b/src/apps/cortex/TransportView/Jamfile
@@ -15,7 +15,7 @@ StaticLibrary cortex_transport_view.a :
 ;
 
 DoCatalogs cortex_transport_view.a :
-	application/x-vnd.Cortex.TransportView
+	x-vnd.Cortex.TransportView
 	:
 	TransportView.cpp
 ;
diff --git a/src/apps/cortex/TransportView/TransportView.cpp b/src/apps/cortex/TransportView/TransportView.cpp
index 42ecab06a7..d5857f9997 100644
--- a/src/apps/cortex/TransportView/TransportView.cpp
+++ b/src/apps/cortex/TransportView/TransportView.cpp
@@ -70,7 +70,7 @@ using namespace std;
 
 __USE_CORTEX_NAMESPACE
 
-static BCatalog sCatalog("application/x-vnd.Cortex.TransportView");
+static BCatalog sCatalog("x-vnd.Cortex.TransportView");
 
 // -------------------------------------------------------- //
 // _GroupInfoView
diff --git a/src/apps/cortex/addons/AudioAdapter/Jamfile b/src/apps/cortex/addons/AudioAdapter/Jamfile
index 94720f3632..83b2571f54 100644
--- a/src/apps/cortex/addons/AudioAdapter/Jamfile
+++ b/src/apps/cortex/addons/AudioAdapter/Jamfile
@@ -25,7 +25,7 @@ Addon cortex_audioadapter.media_addon :
 ;
 
 DoCatalogs cortex_audioadapter.media_addon
-	: application/x-vnd.moon-AudioAdapter.media_addon
+	: x-vnd.moon-AudioAdapter.media_addon
 	:
 	AudioAdapterParams.cpp
 
diff --git a/src/apps/cortex/addons/Flanger/Jamfile b/src/apps/cortex/addons/Flanger/Jamfile
index 280b7fc656..159b49d74f 100644
--- a/src/apps/cortex/addons/Flanger/Jamfile
+++ b/src/apps/cortex/addons/Flanger/Jamfile
@@ -17,7 +17,7 @@ Addon cortex_flanger.media_addon :
 ;
 
 DoCatalogs cortex_flanger.media_addon
-	: application/x-vnd.moon-Flanger.media_addon
+	: x-vnd.moon-Flanger.media_addon
 	:
 	FlangerAddOn.cpp
 	FlangerNode.cpp
diff --git a/src/apps/cortex/addons/LoggingConsumer/Jamfile b/src/apps/cortex/addons/LoggingConsumer/Jamfile
index 957700ae87..d4ec619bb2 100644
--- a/src/apps/cortex/addons/LoggingConsumer/Jamfile
+++ b/src/apps/cortex/addons/LoggingConsumer/Jamfile
@@ -18,7 +18,7 @@ Addon cortex_logging_consumer.media_addon :
 ;
 
 DoCatalogs cortex_logging_consumer.media_addon
-	: application/x-vnd.Be.LoggingConsumerApp
+	: x-vnd.Be.LoggingConsumerApp
 	:
 	LoggingConsumer.cpp
 	LoggingConsumerAddOn.cpp
diff --git a/src/apps/cortex/support/Jamfile b/src/apps/cortex/support/Jamfile
index 677a5837a6..66c3ad6944 100644
--- a/src/apps/cortex/support/Jamfile
+++ b/src/apps/cortex/support/Jamfile
@@ -17,7 +17,7 @@ StaticLibrary cortex_support.a :
 ;
 
 DoCatalogs cortex_support.a :
-	application/x-vnd.Cortex.support
+	x-vnd.Cortex.support
 	:
 	MediaString.cpp
 ;
diff --git a/src/apps/cortex/support/MediaString.cpp b/src/apps/cortex/support/MediaString.cpp
index d08e27d773..5e11489db5 100644
--- a/src/apps/cortex/support/MediaString.cpp
+++ b/src/apps/cortex/support/MediaString.cpp
@@ -51,7 +51,7 @@ __USE_CORTEX_NAMESPACE
 #include <Debug.h>
 #define D_METHOD(x) //PRINT (x)
 
-static BCatalog sCatalog("application/x-vnd.Cortex.support");
+static BCatalog sCatalog("x-vnd.Cortex.support");
 
 // -------------------------------------------------------- //
 // *** media_node strings (public)