3 files changed, 13 insertions, 13 deletions

diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index 61e374a4da..fe9342330f 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -90,7 +90,7 @@
     cuesheet support
                     & on, off           & N/A\\
 %
-    \opt{SWCODEC}{
+    \opt{swcodec}{
       replaygain    & on, off           & N/A\\
       replaygain type
                     & track, album, track shuffle
@@ -159,7 +159,7 @@
       mdb shape     & 50 to 300         & Hz\\
     }%
 
-    \opt{HAVE_LCD_BITMAP}{
+    \opt{lcd_bitmap}{
       peak meter release
                     & 1 to 126          & ?\\
       peak meter hold
@@ -185,12 +185,12 @@
       invert        & on, off           & N/A\\
     }%
 
-    \opt{SWCODEC}{% This doesn't depend on SWCODEC but using a \nopt here
+    \opt{swcodec}{% This doesn't depend on swcodec but using a \nopt here
                   % causes ondiosp not to build for mysterious reasons.
       backdrop      & /path/filename.bmp    & N/A\\
     }%
 
-    \opt{HAVE_LCD_COLOR}{
+    \opt{lcd_color}{
       foreground color & 000000 to FFFFFF   & RRGGBB\\
       background color & 000000 to FFFFFF   & RRGGBB\\
     }
@@ -226,10 +226,10 @@
                 & on, off               & N/A\\
       }%
     }
-    \opt{CONFIG_RTC}{
+    \opt{rtc}{
       time format & 12hour, 24hour      & N/A\\
     }%
-    \opt{HAVE_RECORDING}{
+    \opt{recording}{
      rec quality & 0 to 7               & 0: small size, 7: high quality\\
      rec frequency
                 & 48, 44, 32, 24, 22, 16 & kHz\\
@@ -249,7 +249,7 @@
      rec directory
                 & /recordings,current   & N/A\\
     }%
-    \opt{CONFIG_TUNER}{
+    \opt{radio}{
       force fm mono
                 & off, on               & N/A\\
     }%
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index 7a4a7ba0dd..580978b518 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -10,7 +10,7 @@
   & Directory & \emph{none} & The browser enters that directory \\
 \includegraphics[width=0.37cm]{appendix/images/icon-audio-file.png} 
   & Audio file & 
-  \opt{MASCODEC}{mp3}\opt{SWCODEC}{\emph{various}}
+  \opt{MASCODEC}{mp3}\opt{swcodec}{\emph{various}}
   & Rockbox takes you to the WPS and starts playing the file \\
   \includegraphics[width=0.37cm]{appendix/images/icon-cuesheet.png} 
   & Cuesheet & \fname{.cue} & View a cuesheet file \\
@@ -45,7 +45,7 @@
   & Chip8 game & \fname{.ch8} & Play a Chip8 game \\
 \includegraphics[width=0.37cm]{appendix/images/icon-image-file.png} 
   & Image & \fname{.jpg} & View a JPEG image \\
-\opt{MASCODEC}{\opt{HAVE_LCD_BITMAP}{
+\opt{MASCODEC}{\opt{lcd_bitmap}{
   \includegraphics[width=0.37cm]{appendix/images/icon-movie-file.png} 
     & Rockbox Video & \fname{.rvf} & View a movie (Rockbox format)\\}
 }
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index ec867183c0..1036da875c 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -81,7 +81,7 @@ Example for the \config{\%dN} commands: If the path is
     \opt{player}{
           & This will display a 1 character ``cup'' %
             that empties as the time progresses.}
-    \opt{HAVE_LCD_BITMAP}{
+    \opt{lcd_bitmap}{
          & This will replace the entire line with a progress bar. \\
          & You can set the height, position and width of the progressbar %
            (in pixels): \config{\%pb{\textbar}height{\textbar}leftpos%
@@ -118,12 +118,12 @@ Example for the \config{\%dN} commands: If the path is
   \end{tagmap}
 \end{table}
 
-\opt{SWCODEC}{
+\opt{swcodec}{
 \section{Sound (DSP) settings}
 \begin{table}
   \begin{tagmap}{}{}
     \config{\%sp} & Display current playback pitch \\
-  \opt{SWCODEC}{
+  \opt{swcodec}{
     \config{\%xf} & Crossfade setting, in the order: Off, Shuffle, Skip, Always\\
     \config{\%rg} & ReplayGain value in use (x.y dB). If used as a conditional,
            Replaygain type in use: \config{\%?rg{\textless}Off{\textbar}Track%
@@ -234,7 +234,7 @@ order left -- center -- right. If the aligned texts overlap, they are merged.
 \end{tagmap}
 \end{table}
 
-\opt{CONFIG_RTC}{
+\opt{rtc}{
   \section{Real Time Clock}
   \begin{table}
     \begin{tagmap}{}{}