diff --git a/bfo/pxelinux.cfg/fedora_eol.conf b/bfo/pxelinux.cfg/fedora_eol.conf
index 789ce1c..56f7ce6 100644
--- a/bfo/pxelinux.cfg/fedora_eol.conf
+++ b/bfo/pxelinux.cfg/fedora_eol.conf
@@ -1,6 +1,6 @@
 PROMPT 0
-MENU TITLE Install
-MENU LABEL ^Install
+MENU TITLE unsupported End of Life Fedora releases install
+MENU LABEL ^unsupported End of Life Fedora releases install
 
 TEXT HELP
 	Install end of life and no longer supported versions of Fedora
diff --git a/bfo/pxelinux.cfg/fedora_install.conf b/bfo/pxelinux.cfg/fedora_install.conf
index 8a8d1de..77c54fe 100644
--- a/bfo/pxelinux.cfg/fedora_install.conf
+++ b/bfo/pxelinux.cfg/fedora_install.conf
@@ -1,9 +1,9 @@
 PROMPT 0
-MENU TITLE Install
-MENU LABEL ^Install
+MENU TITLE Install currently supported Fedora releases
+MENU LABEL ^Install currently supported Fedora releases
 
 TEXT HELP
-	Install currently supported version of Fedora
+	Install currently supported Fedora releases
 ENDTEXT
 
 label Fedora-18-i386
diff --git a/bfo/pxelinux.cfg/fedora_prerelease.conf b/bfo/pxelinux.cfg/fedora_prerelease.conf
index be23513..6223b39 100644
--- a/bfo/pxelinux.cfg/fedora_prerelease.conf
+++ b/bfo/pxelinux.cfg/fedora_prerelease.conf
@@ -1,6 +1,6 @@
 PROMPT 0
-MENU TITLE Pre-release Install
-MENU LABEL ^Pre-release
+MENU TITLE Install Pre-release versions of Fedora
+MENU LABEL ^Install Pre-release versions of Fedora
 
 TEXT HELP
 	Install Pre-release versions of Fedora (Alpha, Beta). 
diff --git a/bfo/pxelinux.cfg/fedora_rescue.conf b/bfo/pxelinux.cfg/fedora_rescue.conf
index d8c6f3c..d1cdf16 100644
--- a/bfo/pxelinux.cfg/fedora_rescue.conf
+++ b/bfo/pxelinux.cfg/fedora_rescue.conf
@@ -4,9 +4,27 @@ MENU TITLE Rescue
 MENU LABEL ^Rescue
 
 TEXT HELP
-	Rescue currently supported version of Fedora
+	Rescue currently supported versions of Fedora
 ENDTEXT
 
+label Fedora-18-i386-rescue
+	MENU LABEL Fedora-18-i386-rescue
+	kernel http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os/images/pxeboot/vmlinuz
+	initrd http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/i386/os/images/pxeboot/initrd.img
+        APPEND rescue
+        TEXT HELP
+            Selecting this will boot the Fedora 18 i386 installer in rescue mode
+        ENDTEXT
+
+label Fedora-18-x86_64-rescue
+	MENU LABEL Fedora-18-x86_64-rescue
+	kernel http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os/images/pxeboot/vmlinuz
+	initrd http://download.fedoraproject.org/pub/fedora/linux/releases/18/Fedora/x86_64/os/images/pxeboot/initrd.img
+        APPEND rescue
+        TEXT HELP
+            Selecting this will boot the Fedora 18 x86_64 installer in rescue mode.
+        ENDTEXT
+
 label Fedora-17-i386-rescue
 	MENU LABEL Fedora-17-i386-rescue
 	kernel http://download.fedoraproject.org/pub/fedora/linux/releases/17/Fedora/i386/os/images/pxeboot/vmlinuz
@@ -25,42 +43,6 @@ label Fedora-17-x86_64-rescue
             Selecting this will boot the Fedora 17 x86_64 installer in rescue mode.
         ENDTEXT
 
-label Fedora-16-i386-rescue
-	MENU LABEL Fedora-16-i386-rescue
-	kernel http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/images/pxeboot/vmlinuz
-	initrd http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/i386/os/images/pxeboot/initrd.img
-        APPEND rescue
-        TEXT HELP
-            Selecting this will boot the Fedora 16 i386 installer in rescue mode.
-        ENDTEXT
-
-label Fedora-16-x86_64-rescue
-	MENU LABEL Fedora-16-x86_64-rescue
-	kernel http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/images/pxeboot/vmlinuz
-	initrd http://download.fedoraproject.org/pub/fedora/linux/releases/16/Fedora/x86_64/os/images/pxeboot/initrd.img
-        APPEND rescue
-        TEXT HELP
-            Selecting this will boot the Fedora 16 x86_64 installer in rescue mode.
-        ENDTEXT
-
-label Fedora-15-i386-rescue
-	MENU LABEL Fedora-15-i386-rescue
-	kernel http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/images/pxeboot/vmlinuz
-	initrd http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/i386/os/images/pxeboot/initrd.img
-        APPEND rescue
-        TEXT HELP
-            Selecting this will boot the Fedora 15 i386 installer in rescue mode.
-        ENDTEXT
-
-label Fedora-15-x86_64-rescue
-	MENU LABEL Fedora-15-x86_64-rescue
-	kernel http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/images/pxeboot/vmlinuz
-	initrd http://download.fedoraproject.org/pub/fedora/linux/releases/15/Fedora/x86_64/os/images/pxeboot/initrd.img
-        APPEND rescue
-        TEXT HELP
-            Selecting this will boot the Fedora 15 x86_64 installer in rescue mode.
-        ENDTEXT
-
 label uplvl
         MENU LABEL Back
         MENU EXIT