diff --git a/src/apps/abouthaiku/AboutHaiku.rdef b/src/apps/abouthaiku/AboutHaiku.rdef
index a799128ce8..ccb6a1c427 100644
--- a/src/apps/abouthaiku/AboutHaiku.rdef
+++ b/src/apps/abouthaiku/AboutHaiku.rdef
@@ -11,7 +11,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "AboutHaiku",
-	long_info = "AboutHaiku ©2005-2006 Haiku, Inc."
+	long_info = "AboutHaiku ©2005-207 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/bemail/BeMail.rdef b/src/apps/bemail/BeMail.rdef
index 1237e0969a..5c3a1f30ad 100644
--- a/src/apps/bemail/BeMail.rdef
+++ b/src/apps/bemail/BeMail.rdef
@@ -19,7 +19,7 @@ resource app_version {
 	internal = 3,
 
 	short_info = "BeMail",
-	long_info = "BeMail ©2005-2006 Haiku"
+	long_info = "BeMail ©2005-2007 Haiku, Inc."
 };
 
 resource large_icon {
diff --git a/src/apps/cdplayer/CDPlayer.rdef b/src/apps/cdplayer/CDPlayer.rdef
index 3a026bf8ed..5ba5386fbd 100644
--- a/src/apps/cdplayer/CDPlayer.rdef
+++ b/src/apps/cdplayer/CDPlayer.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-CDPlayer";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -15,9 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "CDPlayer",
-	long_info  = "CDPlayer ©2005-2006 Haiku"
+	long_info  = "CDPlayer ©2005-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 resource large_icon {
 	$"FFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFF000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
diff --git a/src/apps/clock/Clock.rdef b/src/apps/clock/Clock.rdef
index 09c3a6a42d..533382e5f1 100644
--- a/src/apps/clock/Clock.rdef
+++ b/src/apps/clock/Clock.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-Clock";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -12,9 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Clock",
-	long_info  = "Clock ©2006 Haiku"
+	long_info  = "Clock ©2006-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
diff --git a/src/apps/deskbar/Deskbar.rdef b/src/apps/deskbar/Deskbar.rdef
index 97e2f756fc..d3969251f1 100644
--- a/src/apps/deskbar/Deskbar.rdef
+++ b/src/apps/deskbar/Deskbar.rdef
@@ -8,8 +8,8 @@ resource app_version {
 	variety    = B_APPV_FINAL,
 	internal   = 0,
 	short_info = "Deskbar",
-	long_info  = "Deskbar 5.2.1 ©1991-2001 Be Inc.,\n"
-		"©2006 Haiku"
+	long_info  = "Deskbar 5.2.1 ©1991-2001 Be, Inc.,\n"
+		"©2006-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/deskcalc/DeskCalc.rdef b/src/apps/deskcalc/DeskCalc.rdef
index 1833132def..ce9b81faed 100644
--- a/src/apps/deskcalc/DeskCalc.rdef
+++ b/src/apps/deskcalc/DeskCalc.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-DeskCalc";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major  = 2,
 	middle = 1,
@@ -12,9 +10,11 @@ resource app_version {
 	internal = 1,
 
 	short_info = "DeskCalc",
-	long_info = "DeskCalc ©2006 Haiku"
+	long_info = "DeskCalc ©2006-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
diff --git a/src/apps/diskprobe/DiskProbe.rdef b/src/apps/diskprobe/DiskProbe.rdef
index 51efe9f2b0..0eb6e61a32 100644
--- a/src/apps/diskprobe/DiskProbe.rdef
+++ b/src/apps/diskprobe/DiskProbe.rdef
@@ -1,8 +1,6 @@
 
 resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Haiku-DiskProbe";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource(1, "BEOS:FILE_TYPES") message {
 	"types" = "application/octet-stream"
 };
@@ -16,9 +14,11 @@ resource app_version {
 	internal = 3,
 
 	short_info = "DiskProbe",
-	long_info = "DiskProbe ©2004-2006 Haiku"
+	long_info = "DiskProbe ©2004-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
diff --git a/src/apps/expander/Expander.rdef b/src/apps/expander/Expander.rdef
index b329eeac3b..4e84b50bcc 100644
--- a/src/apps/expander/Expander.rdef
+++ b/src/apps/expander/Expander.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-Expander";
 
-resource app_flags B_MULTIPLE_LAUNCH;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -12,9 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Expander",
-	long_info  = "Expander ©2004-2006 Haiku"
+	long_info  = "Expander ©2004-2007 Haiku, Inc."
 };
 
+resource app_flags B_MULTIPLE_LAUNCH;
+
 resource(1, "BEOS:FILE_TYPES") message {
 	"types" = "application/x-gzip",
 	"types" = "application/x-tar",
diff --git a/src/apps/fontdemo/FontDemo.rdef b/src/apps/fontdemo/FontDemo.rdef
index eefe447a17..2b552da3a4 100644
--- a/src/apps/fontdemo/FontDemo.rdef
+++ b/src/apps/fontdemo/FontDemo.rdef
@@ -4,8 +4,6 @@
 
 resource app_signature "application/x-vnd.Haiku-FontDemo";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major  = 1, 
 	middle = 0,
@@ -15,9 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "FontDemo",
-	long_info = "FontDemo ©2006 Haiku"
+	long_info = "FontDemo ©2006-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 resource large_icon array {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFF008C8C0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
diff --git a/src/apps/glteapot/GLTeapot.rdef b/src/apps/glteapot/GLTeapot.rdef
index d2553e04ac..e6db0f3434 100644
--- a/src/apps/glteapot/GLTeapot.rdef
+++ b/src/apps/glteapot/GLTeapot.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-GLTeapot";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -15,9 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "GLTeapot",
-	long_info  = "GLTeapot ©2006 Haiku"
+	long_info  = "GLTeapot ©2006-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 resource large_icon array {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
diff --git a/src/apps/icon-o-matic/Icon-O-Matic.rdef b/src/apps/icon-o-matic/Icon-O-Matic.rdef
index 400229bb2d..437dc01415 100644
--- a/src/apps/icon-o-matic/Icon-O-Matic.rdef
+++ b/src/apps/icon-o-matic/Icon-O-Matic.rdef
@@ -16,7 +16,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Icon-O-Matic",
-	long_info = "Icon-O-Matic ©2006 Haiku"
+	long_info = "Icon-O-Matic ©2006-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/installer/Installer.rdef b/src/apps/installer/Installer.rdef
index 88e7823770..27db254b92 100644
--- a/src/apps/installer/Installer.rdef
+++ b/src/apps/installer/Installer.rdef
@@ -10,7 +10,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Installer",
-	long_info  = "Installer ©2005-2006 Haiku"
+	long_info  = "Installer ©2005-2007 Haiku, Inc."
 };
 
 resource app_flags B_EXCLUSIVE_LAUNCH;
diff --git a/src/apps/magnify/Magnify.rdef b/src/apps/magnify/Magnify.rdef
index 67f92ddbba..c71992521d 100644
--- a/src/apps/magnify/Magnify.rdef
+++ b/src/apps/magnify/Magnify.rdef
@@ -10,7 +10,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Magnify",
-	long_info  = "Magnify ©2006 Haiku"
+	long_info  = "Magnify ©2006-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/mediaplayer/MediaPlayer.rdef b/src/apps/mediaplayer/MediaPlayer.rdef
index 122af8e827..d86408617a 100644
--- a/src/apps/mediaplayer/MediaPlayer.rdef
+++ b/src/apps/mediaplayer/MediaPlayer.rdef
@@ -8,7 +8,7 @@ resource app_version {
 	variety    = B_APPV_BETA,
 	internal   = 0,
 	short_info = "MediaPlayer",
-	long_info  = "MediaPlayer ©2006 Haiku"
+	long_info  = "MediaPlayer ©2006-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/midiplayer/MidiPlayer.rdef b/src/apps/midiplayer/MidiPlayer.rdef
index a89d39575c..94a0c6ed4a 100644
--- a/src/apps/midiplayer/MidiPlayer.rdef
+++ b/src/apps/midiplayer/MidiPlayer.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-MidiPlayer";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major      = 1, 
 	middle     = 0,
@@ -10,13 +8,15 @@ resource app_version {
 	variety    = B_APPV_BETA,
 	internal   = 0,
 	short_info = "MidiPlayer",
-	long_info  = "MidiPlayer ©2004-2006 Haiku"
+	long_info  = "MidiPlayer ©2004-2007 Haiku, Inc."
 };
 
 resource file_types message {
 	"types" = "audio/x-midi"
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 resource large_icon array {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
diff --git a/src/apps/people/People.rdef b/src/apps/people/People.rdef
index 760288d632..98403fb667 100644
--- a/src/apps/people/People.rdef
+++ b/src/apps/people/People.rdef
@@ -1,8 +1,6 @@
 
 resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Be-PEPL";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource(1, "BEOS:FILE_TYPES") message {
 	"types" = "application/x-person"
 };
@@ -16,9 +14,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "People",
-	long_info  = "People ©2005-2006 Haiku"
+	long_info  = "People ©2005-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
diff --git a/src/apps/processcontroller/ProcessController.rdef b/src/apps/processcontroller/ProcessController.rdef
index 775b7b3165..6ebfe0bfc6 100644
--- a/src/apps/processcontroller/ProcessController.rdef
+++ b/src/apps/processcontroller/ProcessController.rdef
@@ -10,8 +10,8 @@ resource app_version {
 	internal = 0,
 
 	short_info = "ProcessController",
-	long_info = "ProcessController ©1997-2001, G.E. Berenger,\n"
-		"©2006 Haiku"
+	long_info = "ProcessController ©1997-2001 G.E. Berenger,\n"
+		"©2006-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/pulse/Pulse.rdef b/src/apps/pulse/Pulse.rdef
index 69adc6ed85..baebf3897e 100644
--- a/src/apps/pulse/Pulse.rdef
+++ b/src/apps/pulse/Pulse.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-Pulse";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -12,9 +10,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Pulse",
-	long_info = "Pulse ©2005-2006 Haiku"
+	long_info = "Pulse ©2005-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
diff --git a/src/apps/showimage/ShowImage.rdef b/src/apps/showimage/ShowImage.rdef
index dcc06dcc2d..846c06c4c6 100644
--- a/src/apps/showimage/ShowImage.rdef
+++ b/src/apps/showimage/ShowImage.rdef
@@ -4,8 +4,6 @@
 
 resource app_signature "application/x-vnd.Haiku-ShowImage";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource file_types message {
 	"types" = "image"
 };
@@ -19,9 +17,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "ShowImage",
-	long_info = "ShowImage ©2003-2006 Haiku"
+	long_info = "ShowImage ©2003-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
diff --git a/src/apps/soundrecorder/SoundRecorder.rdef b/src/apps/soundrecorder/SoundRecorder.rdef
index 2264dde219..14acd4b3de 100644
--- a/src/apps/soundrecorder/SoundRecorder.rdef
+++ b/src/apps/soundrecorder/SoundRecorder.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-SoundRecorder";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major      = 1,
 	middle     = 0,
@@ -10,7 +8,7 @@ resource app_version {
 	variety    = B_APPV_BETA,
 	internal   = 0,
 	short_info = "SoundRecorder",
-	long_info  = "SoundRecorder ©2005-2006 Haiku"
+	long_info  = "SoundRecorder ©2005-2007 Haiku, Inc."
 };
 
 resource file_types message {
@@ -24,6 +22,8 @@ resource file_types message {
 	"types" = "audio/riff"
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 
 resource vector_icon {
diff --git a/src/apps/stylededit/StyledEdit.rdef b/src/apps/stylededit/StyledEdit.rdef
index 4342628409..cfb974aa2a 100644
--- a/src/apps/stylededit/StyledEdit.rdef
+++ b/src/apps/stylededit/StyledEdit.rdef
@@ -13,7 +13,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "StyledEdit",
-	long_info = "StyledEdit ©2002-2006 Haiku"
+	long_info = "StyledEdit ©2002-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/terminal/Terminal.rdef b/src/apps/terminal/Terminal.rdef
index 5aad169396..cacf1c555e 100644
--- a/src/apps/terminal/Terminal.rdef
+++ b/src/apps/terminal/Terminal.rdef
@@ -4,8 +4,6 @@
 
 resource app_signature "application/x-vnd.Haiku-Terminal";
 
-resource app_flags B_MULTIPLE_LAUNCH;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -15,9 +13,11 @@ resource app_version {
 	internal = 1,
 
 	short_info = "Terminal",
-	long_info = "Terminal ©2002-2006 Haiku Inc."
+	long_info = "Terminal ©2002-2007 Haiku Inc."
 };
 
+resource app_flags B_MULTIPLE_LAUNCH;
+
 resource file_types message {
 	"types" = "application/x-vnd.Be-pref"
 };
diff --git a/src/apps/tracker/Tracker.rdef b/src/apps/tracker/Tracker.rdef
index f816b3e622..3b46ce953e 100644
--- a/src/apps/tracker/Tracker.rdef
+++ b/src/apps/tracker/Tracker.rdef
@@ -8,8 +8,8 @@ resource app_version {
 	variety    = B_APPV_FINAL,
 	internal   = 0,
 	short_info = "Tracker",
-	long_info  = "Tracker 5.2.1 ©1991-2001 Be Inc.,\n"
-		"©2006 Haiku"
+	long_info  = "Tracker 5.2.1 ©1991-2001 Be, Inc.,\n"
+		"©2006-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/workspaces/Workspaces.rdef b/src/apps/workspaces/Workspaces.rdef
index 6412b4a809..ed90e31754 100644
--- a/src/apps/workspaces/Workspaces.rdef
+++ b/src/apps/workspaces/Workspaces.rdef
@@ -10,7 +10,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "Workspaces",
-	long_info  = "Workspaces ©2002-2006 Haiku"
+	long_info  = "Workspaces ©2002-2007 Haiku, Inc."
 };
 
 resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/preferences/backgrounds/Backgrounds.rdef b/src/preferences/backgrounds/Backgrounds.rdef
index 5dbda6eda0..38049e1a10 100644
--- a/src/preferences/backgrounds/Backgrounds.rdef
+++ b/src/preferences/backgrounds/Backgrounds.rdef
@@ -18,8 +18,6 @@ resource app_version {
 
 resource app_flags B_SINGLE_LAUNCH;
 
-resource file_types message;
-
 resource large_icon {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFF0000000000FFFFFFFFFFFFFFFF"
diff --git a/src/preferences/datatranslations/DataTranslations.rdef b/src/preferences/datatranslations/DataTranslations.rdef
index 64e82579e3..f8d9619cd0 100644
--- a/src/preferences/datatranslations/DataTranslations.rdef
+++ b/src/preferences/datatranslations/DataTranslations.rdef
@@ -1,8 +1,6 @@
 
 resource app_signature "application/x-vnd.Haiku-Translations";
 
-resource app_flags B_SINGLE_LAUNCH;
-
 resource app_version {
 	major  = 1,
 	middle = 0,
@@ -15,9 +13,11 @@ resource app_version {
 	internal = 0,
 
 	short_info = "DataTranslations",
-    long_info  = "DataTranslations ©2002-2006 Haiku"
+	long_info  = "DataTranslations ©2002-2007 Haiku, Inc."
 };
 
+resource app_flags B_SINGLE_LAUNCH;
+
 resource large_icon array {
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000FFFFFFFFFF"
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000232323230000FFFFFF"