diff --git a/src/apps/codycam/CodyCam.cpp b/src/apps/codycam/CodyCam.cpp
index f651895eb7..b03bab9474 100644
--- a/src/apps/codycam/CodyCam.cpp
+++ b/src/apps/codycam/CodyCam.cpp
@@ -129,7 +129,7 @@ AddTranslationItems(BMenu* intoMenu, uint32 fromType)
 
 
 CodyCam::CodyCam()
-	: BApplication("application/x-vnd.Be.CodyCam"),
+	: BApplication("application/x-vnd.Haiku.CodyCam"),
 	fMediaRoster(NULL),
 	fVideoConsumer(NULL),
 	fWindow(NULL),
diff --git a/src/apps/codycam/CodyCam.rdef b/src/apps/codycam/CodyCam.rdef
index 2bfc0e33dc..68a57c7beb 100644
--- a/src/apps/codycam/CodyCam.rdef
+++ b/src/apps/codycam/CodyCam.rdef
@@ -85,7 +85,7 @@ resource(101, "BEOS:M:STD_ICON") #'MICN' array
 
 #endif // HAIKU_TARGET_PLATFORM_HAIKU
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Be.CodyCam";
+resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku.CodyCam";
 
 resource(1, "BEOS:APP_VERSION") #'APPV' array
 {
diff --git a/src/apps/diskusage/Common.h b/src/apps/diskusage/Common.h
index a0086424ea..52c5c77f79 100644
--- a/src/apps/diskusage/Common.h
+++ b/src/apps/diskusage/Common.h
@@ -55,7 +55,7 @@ EXTERN int kBasePieColorCount;
 EXTERN rgb_color *kBasePieColor;
 
 // Non-resources :)
-PUBLIC_CONST char*	kAppSignature		EQ("application/x-vnd.haiku-diskusage");
+PUBLIC_CONST char*	kAppSignature		EQ("application/x-vnd.Haiku-DiskUsage");
 PUBLIC_CONST char*	kHelpFileName		EQ("userguide/en/applications/apps-diskusage.html");
 PUBLIC_CONST char*	kPieRectAttrName	EQ("mainrect");
 
diff --git a/src/apps/diskusage/DiskUsage.rdef b/src/apps/diskusage/DiskUsage.rdef
index b261ceb09e..5862ed98ec 100644
--- a/src/apps/diskusage/DiskUsage.rdef
+++ b/src/apps/diskusage/DiskUsage.rdef
@@ -1,4 +1,4 @@
-resource app_signature "application/x-vnd.haiku-diskusage";
+resource app_signature "application/x-vnd.Haiku-DiskUsage";
 
 resource app_version {
 		major  = 1,
diff --git a/src/apps/haiku3d/App.cpp b/src/apps/haiku3d/App.cpp
index 913b09c25e..3698dc324f 100644
--- a/src/apps/haiku3d/App.cpp
+++ b/src/apps/haiku3d/App.cpp
@@ -14,7 +14,7 @@
 
 App::App()
 	:
-	BApplication("application/x-vnd.Haiku3d")
+	BApplication("application/x-vnd.Haiku-Haiku3d")
 {
 	BRect frame(50, 50, 640 + 50, 480 + 50);
 	const char *title = "Haiku3d";
diff --git a/src/apps/haiku3d/Haiku3d.rdef b/src/apps/haiku3d/Haiku3d.rdef
index d72294df8f..1b08bc6a65 100644
--- a/src/apps/haiku3d/Haiku3d.rdef
+++ b/src/apps/haiku3d/Haiku3d.rdef
@@ -8,7 +8,7 @@
  * Copyright Be, Inc. (for the temporary icon)
  */
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku3d";
+resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku-Haiku3d";
 
 resource app_version {
 	major  = 1,
diff --git a/src/apps/mandelbrot/Mandelbrot.cpp b/src/apps/mandelbrot/Mandelbrot.cpp
index c543a5ff13..671e8aa8cd 100644
--- a/src/apps/mandelbrot/Mandelbrot.cpp
+++ b/src/apps/mandelbrot/Mandelbrot.cpp
@@ -195,7 +195,7 @@ TMainWindow::MessageReceived(BMessage* message)
 int
 main(int, char**)
 {
-	BApplication* app = new BApplication("application/x-vnd.Be-MAND");
+	BApplication* app = new BApplication("application/x-vnd.Haiku-Mandelbrot");
 
 	BWindow* window = new TMainWindow(BRect(100, 100, 288, 288), "Mandelbrot",
 		B_DOCUMENT_WINDOW, B_WILL_ACCEPT_FIRST_CLICK);
diff --git a/src/apps/mandelbrot/Mandelbrot.rdef b/src/apps/mandelbrot/Mandelbrot.rdef
index 7e40091104..0754054c6d 100644
--- a/src/apps/mandelbrot/Mandelbrot.rdef
+++ b/src/apps/mandelbrot/Mandelbrot.rdef
@@ -83,7 +83,7 @@ resource mini_icon {
 
 #endif // !HAIKU_TARGET_PLATFORM_HAIKU
 
-resource app_signature "application/x-vnd.Be-MAND";
+resource app_signature "application/x-vnd.Haiku-Mandelbrot";
 
 resource app_flags B_MULTIPLE_LAUNCH;
 
diff --git a/src/apps/pairs/Pairs.cpp b/src/apps/pairs/Pairs.cpp
index 9122c3efc3..fd816a866b 100644
--- a/src/apps/pairs/Pairs.cpp
+++ b/src/apps/pairs/Pairs.cpp
@@ -10,7 +10,7 @@
 #include "Pairs.h"
 #include "PairsWindow.h"
 
-const char* kSignature = "application/x-vnd.haiku-Pairs";
+const char* kSignature = "application/x-vnd.Haiku-Pairs";
 
 
 Pairs::Pairs()
diff --git a/src/apps/pairs/Pairs.rdef b/src/apps/pairs/Pairs.rdef
index 455fd2ec44..c8d106b58e 100644
--- a/src/apps/pairs/Pairs.rdef
+++ b/src/apps/pairs/Pairs.rdef
@@ -2,7 +2,7 @@
  * Pairs.rdef
  */
 
-resource app_signature "application/x-vnd.haiku-Pairs";
+resource app_signature "application/x-vnd.Haiku-Pairs";
 
 resource app_flags B_SINGLE_LAUNCH;
 
diff --git a/src/apps/poorman/PoorMan.rdef b/src/apps/poorman/PoorMan.rdef
index 8e4c07b9de..55fefb85b2 100644
--- a/src/apps/poorman/PoorMan.rdef
+++ b/src/apps/poorman/PoorMan.rdef
@@ -1,5 +1,5 @@
 
-resource app_signature "application/x-vnd.haiku.PoorMan";
+resource app_signature "application/x-vnd.Haiku.PoorMan";
 
 resource app_version
 {
diff --git a/src/apps/poorman/constants.cpp b/src/apps/poorman/constants.cpp
index c6d258cf4a..6c924dabd3 100644
--- a/src/apps/poorman/constants.cpp
+++ b/src/apps/poorman/constants.cpp
@@ -5,7 +5,7 @@
 // ------------------------------------------------------
 // PoorMan Window
 extern const char* STR_APP_SIG
-	= "application/x-vnd.haiku.PoorMan";
+	= "application/x-vnd.Haiku.PoorMan";
 			 char* STR_APP_NAME
 	= "PoorMan";
 extern const char* STR_ERR_WEB_DIR
diff --git a/src/apps/processcontroller/PCWorld.cpp b/src/apps/processcontroller/PCWorld.cpp
index 883897e6a4..99fe4ef132 100644
--- a/src/apps/processcontroller/PCWorld.cpp
+++ b/src/apps/processcontroller/PCWorld.cpp
@@ -45,7 +45,7 @@ class PCApplication : public BApplication {
 };
 
 
-const char* kSignature = "application/x-vnd.Geb-ProcessController";
+const char* kSignature = "application/x-vnd.Haiku-ProcessController";
 const char* kTrackerSig = "application/x-vnd.Be-TRAK";
 const char* kDeskbarSig = "application/x-vnd.Be-TSKB";
 const char* kTerminalSig = "application/x-vnd.Haiku-Terminal";
diff --git a/src/apps/processcontroller/ProcessController.rdef b/src/apps/processcontroller/ProcessController.rdef
index d27160557b..b59685fd75 100644
--- a/src/apps/processcontroller/ProcessController.rdef
+++ b/src/apps/processcontroller/ProcessController.rdef
@@ -1,5 +1,5 @@
 
-resource app_signature "application/x-vnd.Geb-ProcessController";
+resource app_signature "application/x-vnd.Haiku-ProcessController";
 
 resource app_version {
 	major  = 3,
diff --git a/src/apps/screenshot/Screenshot.cpp b/src/apps/screenshot/Screenshot.cpp
index d0b020f6c7..a5870d5f45 100644
--- a/src/apps/screenshot/Screenshot.cpp
+++ b/src/apps/screenshot/Screenshot.cpp
@@ -13,7 +13,7 @@
 
 
 Screenshot::Screenshot()
-	: BApplication("application/x-vnd.haiku-screenshot"),
+	: BApplication("application/x-vnd.Haiku-Screenshot"),
 	fArgvReceived(false),
 	fRefsReceived(false)
 {
diff --git a/src/apps/screenshot/Screenshot.rdef b/src/apps/screenshot/Screenshot.rdef
index ef16f31ff4..589310e20a 100644
--- a/src/apps/screenshot/Screenshot.rdef
+++ b/src/apps/screenshot/Screenshot.rdef
@@ -1,5 +1,5 @@
 
-resource app_signature "application/x-vnd.haiku-screenshot";
+resource app_signature "application/x-vnd.Haiku-Screenshot";
 
 resource app_flags B_MULTIPLE_LAUNCH;
 
diff --git a/src/apps/text_search/GlobalDefs.h b/src/apps/text_search/GlobalDefs.h
index b31c34db42..003930e152 100644
--- a/src/apps/text_search/GlobalDefs.h
+++ b/src/apps/text_search/GlobalDefs.h
@@ -6,7 +6,7 @@
 #define GLOBAL_DEFS_H
 
 
-#define APP_SIGNATURE "application/x-vnd.mahlzeit.trackergrep"
+#define APP_SIGNATURE "application/x-vnd.Haiku.TextSearch"
 #define APP_NAME "TextSearch"
 
 #define PREFS_FILE			"TextSearch"
diff --git a/src/apps/text_search/TextSearch.rdef b/src/apps/text_search/TextSearch.rdef
index d5f2d2f5e1..631998aab2 100644
--- a/src/apps/text_search/TextSearch.rdef
+++ b/src/apps/text_search/TextSearch.rdef
@@ -2,7 +2,7 @@
  * TextSearch.rdef
  */
 
-resource app_signature "application/x-vnd.mahlzeit.trackergrep";
+resource app_signature "application/x-vnd.Haiku.TextSearch";
 
 resource app_version {
 	major  = 5,
@@ -12,8 +12,8 @@ resource app_version {
 	variety = B_APPV_FINAL,
 	internal = 0,
 
-	short_info = "Context search using Grep",
-	long_info = "Context search in Tracker, a GUI wrapper of /bin/grep."
+	short_info = "Text search using Grep",
+	long_info = "Text search in Tracker, a GUI wrapper of /bin/grep."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/tv/config.h b/src/apps/tv/config.h
index 3a0da76979..85d2075b55 100644
--- a/src/apps/tv/config.h
+++ b/src/apps/tv/config.h
@@ -34,6 +34,6 @@
 #define BUILD 		__DATE__ " "__TIME__
 #define COPYRIGHT 	B_UTF8_COPYRIGHT" Marcus Overhagen 2005-2007"
 #define INFO1 		"DVB - Digital Video Broadcasting TV"
-#define APP_SIG		"application/x-vnd.MarcusOverhagen."NAME
+#define APP_SIG		"application/x-vnd.Haiku."NAME
 
 #endif
diff --git a/src/apps/tv/tv.rdef b/src/apps/tv/tv.rdef
index 19305fa00e..6e272053f0 100644
--- a/src/apps/tv/tv.rdef
+++ b/src/apps/tv/tv.rdef
@@ -2,7 +2,7 @@
  * Icon-O-Matic.rdef
  */
 
-resource app_signature "application/x-vnd.MarcusOverhagen.TV";
+resource app_signature "application/x-vnd.Haiku.TV";
 
 resource app_version {
 	major  = 1,