Index: branches/azimutz/Chazi/i386/libsaio/stringTable.c
===================================================================
--- branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 507)
+++ branches/azimutz/Chazi/i386/libsaio/stringTable.c	(revision 508)
@@ -501,10 +501,10 @@
     {
       override = true;
 
-      if (ret && (strcmp(key, "Kernel") == 0) && (strcmp(overrideVal, "mach_kernel") == 0))
+      if (ret && (strcmp(key, kKernelNameKey) == 0) && (strcmp(overrideVal, kDefaultKernelName) == 0))
         override = false;
 
-      if (ret && (strcmp(key, "Kernel Flags") == 0) && (overrideSize == 0))
+      if (ret && (strcmp(key, kKernelFlagsKey) == 0) && (overrideSize == 0))
         override = false;
 
       if (override)
Index: branches/azimutz/Chazi/i386/boot2/options.c
===================================================================
--- branches/azimutz/Chazi/i386/boot2/options.c	(revision 507)
+++ branches/azimutz/Chazi/i386/boot2/options.c	(revision 508)
@@ -1286,11 +1286,11 @@
     } else {
         if ( getValueForKey( kKernelNameKey, &val, &cnt, &bootInfo->bootConfig ) ) {
             strlcpy( bootInfo->bootFile, val, cnt+1 );
-            if (strcmp( bootInfo->bootFile, kDefaultKernel ) != 0) {
+            if (strcmp( bootInfo->bootFile, kDefaultKernelName ) != 0) {
                 gOverrideKernel = true;
             }
         } else {
-            strcpy( bootInfo->bootFile, kDefaultKernel );
+            strcpy( bootInfo->bootFile, kDefaultKernelName );
         }
     }