Index: branches/azimutz/Chazi/i386/libsaio/device_inject.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/device_inject.c	(revision 510)
+++ branches/azimutz/Chazi/i386/libsaio/device_inject.c	(revision 511)
@@ -55,7 +55,7 @@
   /* Use the static "device-properties" boot config key contents if available,
    * otheriwse use the generated one.
    */  
-  if (!getValueForKey(kDeviceProperties, &val, &cnt, &bootInfo->bootConfig) && string)
+  if (!getValueForKey(kRenamePartitionKey, &val, &cnt, &bootInfo->bootConfig) && string)
   {
     val = (const char*)string;
     cnt = strlength * 2;
Index: branches/azimutz/Chazi/i386/libsaio/sys.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/sys.c	(revision 510)
+++ branches/azimutz/Chazi/i386/libsaio/sys.c	(revision 511)
@@ -825,7 +825,7 @@
 	 * to override the default selection.
 	 * We accept only kBVFlagSystemVolume or kBVFlagForeignBoot volumes.
 	 */
-	char *val = XMLDecode(getStringForKey(kDefaultPartition, &bootInfo->bootConfig));
+	char *val = XMLDecode(getStringForKey(kDefaultPartitionKey, &bootInfo->bootConfig));
     if (val) {
         for ( bvr = chain; bvr; bvr = bvr->next ) {
             if (matchVolumeToString(bvr, val, false)) {
Index: branches/azimutz/Chazi/i386/libsaio/disk.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/disk.c	(revision 510)
+++ branches/azimutz/Chazi/i386/libsaio/disk.c	(revision 511)
@@ -1566,7 +1566,7 @@
   char* val = 0;
   int len;
     
-  getValueForKey(kHidePartition, &raw, &len, &bootInfo->bootConfig);
+  getValueForKey(kHidePartitionKey, &raw, &len, &bootInfo->bootConfig);
   if(raw)
   {
       val = XMLDecode(raw);  
@@ -1743,7 +1743,7 @@
     if ( !str || strMaxLen <= 0)
         return false;
     
-    aliasList = XMLDecode(getStringForKey(kRenamePartition, &bootInfo->bootConfig));
+    aliasList = XMLDecode(getStringForKey(kRenamePartitionKey, &bootInfo->bootConfig));
     if ( !aliasList )
         return false;
     
Index: branches/azimutz/Chazi/i386/libsaio/saio_types.h
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/saio_types.h	(revision 510)
+++ branches/azimutz/Chazi/i386/libsaio/saio_types.h	(revision 511)
@@ -231,6 +231,7 @@
     DEV_EN = 3
 };
 
+//Azi: change this stuff back to upercase??
 #define max(a,b) ((a) > (b) ? (a) : (b))
 #define min(a,b) ((a) < (b) ? (a) : (b))
 
Index: branches/azimutz/Chazi/i386/boot2/boot.h
===================================================================
--- branches/azimutz/Chazi/i386/boot2/boot.h	(revision 510)
+++ branches/azimutz/Chazi/i386/boot2/boot.h	(revision 511)
@@ -75,37 +75,37 @@
 */
 
 /*
- * Internal or Boot.plist only keys (firstrun) - these end with "Key" (key/value pair).??
+ * Internal or "default" Boot.plist only keys (firstrun) - these end with "Key".
  *
  * keys that make no sense on "override" Boot.plist or at boot prompt;
  * like so, they won't be present on BootHelp.txt.
  *
  */
-//		identifier			string				location
-#define kTextModeKey		"Text Mode"			// graphics.c
-#define kProductVersion		"ProductVersion"	// boot.c
-#define kDefaultPartition	"Default Partition"	// sys.c
-#define kHidePartition		"Hide Partition"	// disk.c
-#define kRenamePartition	"Rename Partition"	// disk.c
-#define kInstantMenuKey		"Instant Menu"		// boot.c
-#define kQuietBootKey		"Quiet Boot"		// boot.c
-#define kTimeoutKey			"Timeout"			// options.c
-#define kThemeNameKey		"Theme"				// gui.c				getValFK??
-#define kGUIKey				"GUI"				// boot.c
-#define kBootBannerKey		"Boot Banner"		// options.c
-#define kDebugInfoKey		"DebugInfo"			// gui.c, graphics.c
-#define kCDROMPromptKey		"CD-ROM Prompt"		// options.c
-#define kCDROMOptionKey		"CD-ROM Option Key"	// options.c
-#define kRescanPromptKey	"Rescan Prompt"		// boot.c
-#define kRescanKey		    "Rescan"			// boot.c
-#define kScanSingleDriveKey	"Scan Single Drive"	// boot.c
-#define kDeviceProperties	"device-properties"	// device_inject.c
+//		identifier			 string				 location
+#define kTextModeKey		 "Text Mode"		 // graphics.c
+#define kProductVersionKey	 "ProductVersion"	 // options.c (boot.c on trunk)
+#define kDefaultPartitionKey "Default Partition" // sys.c
+#define kHidePartitionKey	 "Hide Partition"	 // disk.c
+#define kRenamePartitionKey	 "Rename Partition"	 // disk.c
+#define kInstantMenuKey		 "Instant Menu"		 // boot.c
+#define kQuietBootKey		 "Quiet Boot"		 // boot.c
+#define kTimeoutKey			 "Timeout"			 // options.c
+#define kThemeNameKey		 "Theme"			 // gui.c
+#define kGUIKey				 "GUI"				 // boot.c
+#define kBootBannerKey		 "Boot Banner"		 // options.c
+#define kDebugInfoKey		 "DebugInfo"		 // gui.c, graphics.c
+#define kCDROMPromptKey		 "CD-ROM Prompt"	 // options.c
+#define kCDROMOptionKey		 "CD-ROM Option Key" // options.c
+#define kRescanPromptKey	 "Rescan Prompt"	 // boot.c
+#define kRescanKey		     "Rescan"			 // boot.c
+#define kScanSingleDriveKey	 "Scan Single Drive" // boot.c
+#define kRenamePartitionKey	 "device-properties" // device_inject.c
 
 
 /*
- * Prompt or Boot.plist keys (secondrun) - these end with "Key"??
+ * Prompt or Boot.plist keys (secondrun) - these end with "Key".
  *
- * Keys that make some or all sense at boot prompt.
+ * Keys that make some/all sense at boot prompt or any Boot.plist.
  *
  */
 #define kWaitForKeypressKey	"Wait"				// boot.c
@@ -138,7 +138,7 @@
 #define kGeneratePStates	"GeneratePStates"	// acpi_patcher.c
 #define kGenerateCStates	"GenerateCStates"	// acpi_patcher.c
 #define kEnableC4States		"EnableC4State"		// acpi_patcher.c
-#define kUseMemDetect		"UseMemDetect"	    // platform.c - change name-->memDetect?
+#define kUseMemDetect		"UseMemDetect"	    // platform.c
 #define kSMBIOSdefaults		"SMBIOSdefaults"	// smbios_patcher.c
 #define kSMBIOSKey			"SMBIOS"			// fake_efi.c
 #define kSystemID			"SystemId"			// fake_efi.c
Index: branches/azimutz/Chazi/i386/boot2/options.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/options.c	(revision 510)
+++ branches/azimutz/Chazi/i386/boot2/options.c	(revision 511)
@@ -1447,7 +1447,7 @@
 
 	if (valid)
 	{
-		if (getValueForKey(kProductVersion, &val, &len, &systemVersion))
+		if (getValueForKey(kProductVersionKey, &val, &len, &systemVersion))
 		{
 			// getValueForKey uses const char for val
 			// so copy it and trim