3 files changed, 10 insertions, 10 deletions

diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index 3247bcbcc5..65813cbb61 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -118,7 +118,7 @@ paragraph.
 
   On the curved top it has the headphone jack to the left,
   the \ButtonOff{} button is in the middle%
-  \opt{HAVE_RECORDING}{ and the line in jack to the right}.
+  \opt{recording}{ and the line in jack to the right}.
   Apart from the already mentioned MMC slot you will find the USB connector on
   the \daps{} right side. Placed on the upper side of the device right below
   the flat display there is the main button pad of the \dap{}. A strong deepening
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 1b5bc9106e..149fbeaa97 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -4,7 +4,7 @@
 \subsection{Introduction}
 This chapter describes the Rockbox music database system. Using the information
 contained in the tags (ID3v1, ID3v2%
-  \opt{SWCODEC}{, Vorbis Comments, Apev2, etc.}%
+  \opt{swcodec}{, Vorbis Comments, Apev2, etc.}%
 ) in your audio files, Rockbox builds and maintains a database of the music
 files on your player and allows you to browse them by Artist, Album and Genre.
 
@@ -32,7 +32,7 @@ its subdirectories will be scanned and added to the database.
 \subsection{\label{ref:databasemenu}The Database Menu}
 
 \begin{description}
-  \opt{SWCODEC}{
+  \opt{swcodec}{
   \item[Load To Ram.]
     The database can either be kept on disk (to save memory), or
     loaded into RAM (for fast browsing). Setting this to \setting{Yes} loads
@@ -48,7 +48,7 @@ its subdirectories will be scanned and added to the database.
 \item[Auto Update.]
   If \setting{Auto update} is set to \setting{on}, each time the \dap{}
   boots, the database will automatically be updated.
-  \opt{SWCODEC}{
+  \opt{swcodec}{
     \note{The \setting{Auto Update} will only check for deleted files if the
       \setting{Directory Cache} (\setting{Settings $\rightarrow$ General
       Settings $\rightarrow$ System $\rightarrow$ Disk $\rightarrow$
@@ -67,7 +67,7 @@ its subdirectories will be scanned and added to the database.
 
 \item[Update Now.]
   \setting{Update now} causes the database to detect new and deleted files
-  \opt{SWCODEC}{
+  \opt{swcodec}{
     \note{Unlike the \setting{Auto Update} function, \setting{Update Now}
       will update the database regardless of whether the \setting{Directory Cache}
       is enabled. Thus, an update using \setting{Update now} may take a long
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 478bdeae8f..03ec1562e5 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -3,7 +3,7 @@
 The While Playing Screen (WPS) displays various pieces of information about the
 currently playing audio file.
 %
-\opt{HAVE_LCD_BITMAP}{%
+\opt{lcd_bitmap}{%
   The appearance of the WPS can be configured using WPS configuration files.
   The items shown depend on your configuration -- all item can be turned on
   or off independently. Refer to \reference{ref:wps_tags} for details on how
@@ -11,7 +11,7 @@ currently playing audio file.
   \begin{itemize}
     \nopt{ondio}{
     \item Status bar: The Status bar shows Battery level, charger status, 
-      volume, play mode, repeat mode, shuffle mode\opt{CONFIG_RTC}{ and clock}.
+      volume, play mode, repeat mode, shuffle mode\opt{rtc}{ and clock}.
       In contrast to all other items, the status bar is always at the top of
       the screen.
     }
@@ -115,11 +115,11 @@ your WPS (While Playing Screen).
 \end{table}
 
 
-\opt{HAVE_LCD_BITMAP}{
+\opt{lcd_bitmap}{
   \subsection{\label{ref:peak_meter}Peak Meter}
   The peak meter can be displayed on the While Playing Screen and consists of
   several indicators. 
-  \opt{HAVE_RECORDING}{
+  \opt{recording}{
     For a picture of the peak meter, please see the While
     Recording Screen in \reference{ref:while_recording_screen}.
   }
@@ -242,7 +242,7 @@ function in the file browser's \setting{Context Menu}.
   }
 }
 
-\opt{SWCODEC}{
+\opt{swcodec}{
   \subsubsection{Graphical EQ}
   This is a shortcut to the \setting{Equalizer}. See \reference{ref:EQ}.