1 files changed, 7 insertions, 7 deletions

diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 49091c304c..96be3269d8 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -67,14 +67,14 @@ software.
 \opt{SWCODEC}{
   \subsection{Introduction}
   
-  \opt{HAVE_FIRMWARE_ON_DISK}{There are three separate components of Rockbox, 
+  \opt{HAVE_RB_BL_ON_DISK}{There are three separate components of Rockbox, 
   two of which need to be installed in order to run Rockbox.}
   
-  \opt{HAVE_FIRMWARE_IN_FLASH}{There are two separate components of Rockbox 
+  \opt{HAVE_RB_BL_IN_FLASH}{There are two separate components of Rockbox 
   that need to be installed in order to run Rockbox.}
   
   \begin{description}
-  \opt{HAVE_FIRMWARE_ON_DISK}{    
+  \opt{HAVE_RB_BL_ON_DISK}{    
   \item[The \playerman{} bootloader]
     The \playerman{} bootloader is the program that tells your \dap{} how to boot 
     and load the remaining firmware from disk. It is also responsible for the
@@ -85,20 +85,20 @@ software.
     in order to install Rockbox.}
     
   \item[The Rockbox bootloader.] \index{Bootloader}
-    \opt{HAVE_FIRMWARE_ON_DISK}{The Rockbox bootloader is loaded from disk by 
+    \opt{HAVE_RB_BL_ON_DISK}{The Rockbox bootloader is loaded from disk by 
     the \playerman{} bootloader. It is responsible for loading the Rockbox 
     firmware and for providing the dual boot function. It directly replaces the
     \playerman{} firmware on the \daps{} disk.}
-    \opt{HAVE_FIRMWARE_IN_FLASH}{
+    \opt{HAVE_RB_BL_IN_FLASH}{
     The bootloader is the program that tells your 
     \dap{} how to boot and load other components of Rockbox. This is the 
     component of Rockbox that is installed to the flash memory of your 
     \playerman.}
   
   \item[The Rockbox firmware.] 
-    \opt{HAVE_FIRMWARE_IN_FLASH}{Unlike the \playerman{} firmware, which runs 
+    \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs 
     entirely from flash memory, }
-    \opt{HAVE_FIRMWARE_ON_DISK}{Similar to the \playerman{} firmware, }
+    \opt{HAVE_RB_BL_ON_DISK}{Similar to the \playerman{} firmware, }
     most of the Rockbox code is contained in a 
     ``build'' that resides on your \daps{} hard drive. This makes it easy to 
     update Rockbox. The build consists of a file named \firmwarefilename{} and a