diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 25335d7af1..08b19aa185 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -51,7 +51,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
 	query quit
 	rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
 	rmindex rmdir roster route
-	safemode screen_blanker screenmode sdiff setdecor settype setversion
+	safemode screen_blanker screenmode screenshot sdiff setdecor settype setversion
 	setvolume setwep seq sha1sum shar shred shuf shutdown sleep sort spamdbm
 	split stat strace stty su sum sync sysinfo
 	tac tail tcpdump tcptester tee telnet telnetd test timeout top touch
@@ -66,8 +66,7 @@ SYSTEM_APPS = AboutSystem ActivityMonitor CharacterMap CodyCam DeskCalc Devices
 	DiskProbe DiskUsage DriveSetup CDPlayer Expander Icon-O-Matic Installer
 	LaunchBox Magnify Mail MediaConverter MediaPlayer MidiPlayer NetworkStatus
 	PackageInstaller People PoorMan PowerStatus ProcessController Screenshot
-	ScreenshotApp ShowImage SoundRecorder StyledEdit Terminal TextSearch TV
-	Workspaces
+	ShowImage SoundRecorder StyledEdit Terminal TextSearch TV	Workspaces
 ;
 SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
 	<preference>Deskbar E-mail FileTypes Fonts Keyboard Keymap Locale Media
diff --git a/src/apps/screenshot/Jamfile b/src/apps/screenshot/Jamfile
index e1f2fff750..94b052893c 100644
--- a/src/apps/screenshot/Jamfile
+++ b/src/apps/screenshot/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps screenshot ;
 
 UsePrivateHeaders interface ;
 
-Application ScreenshotApp :
+Application Screenshot :
 	ScreenshotApp.cpp
 	ScreenshotWindow.cpp
 	PreviewView.cpp
@@ -11,14 +11,14 @@ Application ScreenshotApp :
 	: ScreenshotApp.rdef
 ;
 
-DoCatalogs ScreenshotApp :
-	x-vnd.Haiku-ScreenshotApp
+DoCatalogs Screenshot :
+	x-vnd.haiku-screenshot
 	:
 	ScreenshotWindow.cpp
 	Utility.cpp
 ;
 
-Application Screenshot :
+Application screenshot :
 	Screenshot.cpp
 	Utility.cpp
 	: be locale translation $(TARGET_LIBSUPC++)
diff --git a/src/apps/screenshot/Screenshot.cpp b/src/apps/screenshot/Screenshot.cpp
index e3ba57eae3..e2a7f8112b 100644
--- a/src/apps/screenshot/Screenshot.cpp
+++ b/src/apps/screenshot/Screenshot.cpp
@@ -31,7 +31,7 @@
 
 Screenshot::Screenshot()
 	:
-	BApplication("application/x-vnd.Haiku-Screenshot"),
+	BApplication("application/x-vnd.haiku-screenshot-cli"),
 	fUtility(new Utility()),
 	fLaunchGui(true)
 {
@@ -151,7 +151,7 @@ Screenshot::ReadyToRun()
 			message.AddRect("tabFrame", fUtility->tabFrame);
 			message.AddFloat("borderSize", fUtility->borderSize);
 
-			be_roster->Launch("application/x-vnd.Haiku-ScreenshotApp",
+			be_roster->Launch("application/x-vnd.haiku-screenshot",
 				&message);
 		}
 	}
diff --git a/src/apps/screenshot/Screenshot.rdef b/src/apps/screenshot/Screenshot.rdef
index 43448c7269..fe6c1adf8b 100644
--- a/src/apps/screenshot/Screenshot.rdef
+++ b/src/apps/screenshot/Screenshot.rdef
@@ -1,4 +1,4 @@
-resource app_signature "application/x-vnd.Haiku-Screenshot";
+resource app_signature "application/x-vnd.haiku-screenshot-cli";
 
 resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;
 
@@ -8,8 +8,8 @@ resource app_version {
 	minor  = 0,
 	variety = B_APPV_BETA,
 	internal = 0,
-	short_info = "Screenshot",
-	long_info  = "Screenshot ©2008-2010 Haiku"
+	short_info = "Screenshot CLI",
+	long_info  = "Screenshot CLI ©2008-2010 Haiku"
 };
 
 resource vector_icon {
diff --git a/src/apps/screenshot/ScreenshotApp.cpp b/src/apps/screenshot/ScreenshotApp.cpp
index 7aefb6a4ac..2e608fe873 100644
--- a/src/apps/screenshot/ScreenshotApp.cpp
+++ b/src/apps/screenshot/ScreenshotApp.cpp
@@ -21,7 +21,7 @@
 
 ScreenshotApp::ScreenshotApp()
 	:
-	BApplication("application/x-vnd.Haiku-ScreenshotApp"),
+	BApplication("application/x-vnd.haiku-screenshot"),
 	fUtility(new Utility)
 {
 	be_locale->GetAppCatalog(&fCatalog);
diff --git a/src/apps/screenshot/ScreenshotApp.rdef b/src/apps/screenshot/ScreenshotApp.rdef
index 88683897b9..db1f5baaf2 100644
--- a/src/apps/screenshot/ScreenshotApp.rdef
+++ b/src/apps/screenshot/ScreenshotApp.rdef
@@ -1,4 +1,4 @@
-resource app_signature "application/x-vnd.Haiku-ScreenshotApp";
+resource app_signature "application/x-vnd.haiku-screenshot";
 
 resource app_flags B_MULTIPLE_LAUNCH;
 
@@ -8,8 +8,8 @@ resource app_version {
 	minor  = 0,
 	variety = B_APPV_BETA,
 	internal = 0,
-	short_info = "ScreenshotApp",
-	long_info  = "ScreenshotApp ©2008-2010 Haiku"
+	short_info = "Screenshot",
+	long_info  = "Screenshot ©2008-2010 Haiku"
 };
 
 resource vector_icon {
diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp
index 26b3514f70..5edd0b9862 100644
--- a/src/apps/screenshot/ScreenshotWindow.cpp
+++ b/src/apps/screenshot/ScreenshotWindow.cpp
@@ -332,7 +332,7 @@ ScreenshotWindow::_NewScreenshot()
 	delay.CopyInto(argv[2], 0, charCount);
 	argv[2][charCount] = '\0';
 
-	be_roster->Launch("application/x-vnd.Haiku-Screenshot", argc, argv);
+	be_roster->Launch("application/x-vnd.haiku-screenshot-cli", argc, argv);
 	be_app->PostMessage(B_QUIT_REQUESTED);
 }
 
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 964c2b564c..ab7c4d1673 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -3618,7 +3618,7 @@ BWindow::_HandleKeyDown(BMessage* event)
 		if ((modifiers & B_SHIFT_KEY) != 0 || (modifiers & B_OPTION_KEY) != 0)
 			message.ReplaceBool("silent", false);
 
-		be_roster->Launch("application/x-vnd.haiku-screenshot", &message);
+		be_roster->Launch("application/x-vnd.haiku-screenshot-cli", &message);
 		return true;
 	}