diff --git a/namedev.c b/namedev.c
index 41480d50c0..7c8761088f 100644
--- a/namedev.c
+++ b/namedev.c
@@ -286,7 +286,7 @@ static int namedev_init_config(void)
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("id", &temp, &temp3);
+			retval = get_value("ID", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.id, temp3);
@@ -314,7 +314,7 @@ static int namedev_init_config(void)
 
 			/* PLACE="place" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("place", &temp, &temp3);
+			retval = get_value("PLACE", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.place, temp3);
@@ -353,19 +353,19 @@ static int namedev_init_config(void)
 			/* number type */
 			dev.type = CALLOUT;
 
-			/* PROGRAM="executable" */
-			retval = get_value("PROGRAM", &temp, &temp3);
-			if (retval)
-				break;
-			strfieldcpy(dev.exec_program, temp3);
-
 			/* BUS="bus" */
-			temp2 = strsep(&temp, ",");
 			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.bus, temp3);
 
+			/* PROGRAM="executable" */
+			temp2 = strsep(&temp, ",");
+			retval = get_value("PROGRAM", &temp, &temp3);
+			if (retval)
+				break;
+			strfieldcpy(dev.exec_program, temp3);
+
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
 			retval = get_value("ID", &temp, &temp3);
diff --git a/udev.8 b/udev.8
index e46caaf322..079d15f4d1 100644
--- a/udev.8
+++ b/udev.8
@@ -105,7 +105,7 @@ TOPOLOGY, BUS="usb", PLACE="2.3", NAME="mouse1"
 REPLACE, KERNEL="ttyUSB1", NAME="pda"
 
 # if /sbin/scsi_id returns "OEM 0815" device will be called disk1
-CALLOUT, PROGRAM="/sbin/scsi_id" BUS="scsi", ID="OEM 0815" NAME="disk1"
+CALLOUT, BUS="scsi", PROGRAM="/sbin/scsi_id", ID="OEM 0815", NAME="disk1"
 
 # USB webcams to be called webcam0, webcam1, ...
 LABEL, BUS="usb", model="WebCam Version 3", NAME="webcam%n"