diff --git a/src/apps/deskbar/Deskbar.rdef b/src/apps/deskbar/Deskbar.rdef
index 3cde021b73..e22e7c53db 100644
--- a/src/apps/deskbar/Deskbar.rdef
+++ b/src/apps/deskbar/Deskbar.rdef
@@ -1,7 +1,7 @@
 
-resource(1, "BEOS:FILE_TYPES") message;
+resource file_types message;
 
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
+resource large_icon array
 {
 	$"FFFFFF0000FFFFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 	$"FFFF00FAFA0000FFFFFFFFFFFFFF00600000FFFFFFFFFFFFFFFFFFFFFFFFFFFF"
@@ -37,7 +37,7 @@ resource(101, "BEOS:L:STD_ICON") #'ICON' array
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000E0FFFFFFFFFFFFFFF"
 };
 
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
+resource mini_icon array
 {
 	$"FF000000FFFFFFFF00FFFFFFFFFFFFFF"
 	$"0000FAFA0000FF00600000FFFFFFFFFF"
@@ -57,32 +57,17 @@ resource(101, "BEOS:M:STD_ICON") #'MICN' array
 	$"FFFFFFFFFFFFFFFFFFFF0000000EFFFF"
 };
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Be-TSKB";
+resource app_signature "application/x-vnd.Be-TSKB";
 
-resource(1, "BEOS:APP_VERSION") #'APPV' array
+resource app_version
 {
-	$"05000000020000000100000005000000000000004F70656E4465736B62617200"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"00000000000000000000000000000000000000004F70656E4465736B62617220"
-	$"352E322E3120666F722042654F532040313939312D3230303120426520496E63"
-	$"2E00000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000050000000000000000000000"
-	$"000000000000000042654F533500000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"000000000000000042654F53203520C2A9313939312D3230303020426520496E"
-	$"636F72706F726174656400000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000"
+        major      = 5,
+        middle     = 2,
+        minor      = 1,
+        variety    = B_APPV_FINAL,
+        internal   = 0,
+        short_info = "OpenDeskbar",
+        long_info  = "OpenDeskbar 5.2.1 for BeOS © 1991-2001 Be Inc."
 };
 
-resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+resource app_flags B_SINGLE_LAUNCH;
diff --git a/src/apps/tracker/Tracker.rdef b/src/apps/tracker/Tracker.rdef
index ab672d63d2..de712d50c6 100644
--- a/src/apps/tracker/Tracker.rdef
+++ b/src/apps/tracker/Tracker.rdef
@@ -1,5 +1,5 @@
 
-resource(1, "BEOS:FILE_TYPES") message
+resource file_types message
 {
 	"types" = "application/x-vnd.Be-symlink",
 	"types" = "application/x-vnd.Be-directory",
@@ -8,7 +8,7 @@ resource(1, "BEOS:FILE_TYPES") message
 	"types" = "application/x-vnd.Be-queryTemplate"
 };
 
-resource(101, "BEOS:L:STD_ICON") #'ICON' array
+resource large_icon array
 {
 	$"FFFF000000FFFFFFFFFFFFFFFFFFFFFF0000000000000000000000FFFFFFFFFF"
 	$"FF00D9D9D900FFFFFFFFFFFFFFFF0000838383838383008383D9D900FFFFFFFF"
@@ -44,7 +44,7 @@ resource(101, "BEOS:L:STD_ICON") #'ICON' array
 	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
-resource(101, "BEOS:M:STD_ICON") #'MICN' array
+resource mini_icon array
 {
 	$"FF0000FFFFFFFFFF000000000000FFFF"
 	$"00D900000000FF008383D900838300FF"
@@ -64,32 +64,17 @@ resource(101, "BEOS:M:STD_ICON") #'MICN' array
 	$"FFFFFFFFFFFFFF00000E0F0F0FFFFFFF"
 };
 
-resource(1, "BEOS:APP_SIG") #'MIMS' "application/x-vnd.Be-TRAK";
+resource app_signature "application/x-vnd.Be-TRAK";
 
-resource(1, "BEOS:APP_VERSION") #'APPV' array
+resource app_version
 {
-	$"05000000020000000100000005000000000000004F70656E547261636B657200"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"00000000000000000000000000000000000000004F70656E547261636B657220"
-	$"352E322E3120666F722042654F5320C2A9313939312D3230303120426520496E"
-	$"632E000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000050000000000000000000000"
-	$"0500000000000000523500000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"000000000000000042654F53203520C2A9313939312D3230303020426520496E"
-	$"636F72706F726174656400000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000000000000000000000000000000000000000000000000000"
-	$"0000000000000000"
+        major      = 5,
+        middle     = 2,
+        minor      = 1,
+        variety    = B_APPV_FINAL,
+        internal   = 0,
+        short_info = "OpenTracker",
+        long_info  = "OpenTracker 5.2.1 for BeOS © 1991-2001 Be Inc."
 };
 
-resource(1, "BEOS:APP_FLAGS") #'APPF' $"00000000";
+resource app_flags B_SINGLE_LAUNCH;