diff --git a/doc/metropolistheme.dtx b/doc/metropolistheme.dtx
index 2dbbb1d..086fb5f 100644
--- a/doc/metropolistheme.dtx
+++ b/doc/metropolistheme.dtx
@@ -335,16 +335,16 @@ The list of options is structured as shown in the following example.
                {regular, smallcaps, allsmallcaps, allcaps}
                {regular}{
   Changes the format of titles, subtitles, section titles, frame titles, and
-  the text on standout ``plain'' frames. The available options produce
+  the text on ``standout'' frames. The available options produce
   Regular, \textsc{SmallCaps}, \textsc{\MakeLowercase{AllSmallCaps}}, or
   \MakeUppercase{AllCaps} titles. Please refer to
   Section~\ref{sec:titleformats} for known issues with these options.
 }
 
-\DescribeOption{titleformat-plain}%
+\DescribeOption{titleformat plain}%
                {regular, smallcaps, allsmallcaps, allcaps}%
                {regular}{
-  Changes the format of standout ``plain'' frames (see |titleformat|, above).
+  Changes the format of ``standout'' frames (see |titleformat|, above).
 }
 
 
@@ -391,10 +391,10 @@ The list of options is structured as shown in the following example.
 
 \subsubsection{Font theme}
 
-\DescribeMacro{titleformat-title}
-\DescribeMacro{titleformat-subtitle}
-\DescribeMacro{titeformat-section}
-\DescribeOption{titleformat-frame}%
+\DescribeMacro{titleformat title}
+\DescribeMacro{titleformat subtitle}
+\DescribeMacro{titeformat section}
+\DescribeOption{titleformat frame}%
                {regular, smallcaps, allsmallcaps, allcaps}%
                {regular}{
   Individually controls the format of titles, subtitles, section titles, and