diff --git a/demo/demo.tex b/demo/demo.tex
index 50eb7fa..c312ad6 100644
--- a/demo/demo.tex
+++ b/demo/demo.tex
@@ -65,7 +65,7 @@
 \end{frame}
 
 {
-\metroset{titleformat frame=smallcaps}
+\metroset{titleformat-frame=smallcaps}
 \begin{frame}{Small caps}
 	This frame uses the \texttt{smallcaps} titleformat.
 
@@ -76,7 +76,7 @@
 }
 
 {
-\metroset{titleformat frame=allsmallcaps}
+\metroset{titleformat-frame=allsmallcaps}
 \begin{frame}{All small caps}
 	This frame uses the \texttt{allsmallcaps} titleformat.
 
@@ -89,7 +89,7 @@
 }
 
 {
-\metroset{titleformat frame=allcaps}
+\metroset{titleformat-frame=allcaps}
 \begin{frame}{All caps}
 	This frame uses the \texttt{allcaps} titleformat.
 
diff --git a/source/beamerinnerthememetropolis.dtx b/source/beamerinnerthememetropolis.dtx
index 7fb86cd..70f2538 100644
--- a/source/beamerinnerthememetropolis.dtx
+++ b/source/beamerinnerthememetropolis.dtx
@@ -64,11 +64,11 @@
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{titleformat title}
+% \begin{macro}{titleformat-title}
 % Control the titleformat of the title
 %    \begin{macrocode}
 \pgfkeys{
-  /metropolis/inner/titleformat title/.cd,
+  /metropolis/inner/titleformat-title/.cd,
     .is choice,
     regular/.code={%
       \let\metropolis@titleformat\@empty%
@@ -82,25 +82,25 @@
       \let\metropolis@titleformat\MakeLowercase%
       \setbeamerfont{title}{shape=\scshape}%
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat title=allsmallcaps can lead to problems%
+        Be aware that titleformat-title=allsmallcaps can lead to problems%
       }
     },
     allcaps/.code={%
       \let\metropolis@titleformat\MakeUppercase%
       \setbeamerfont{title}{shape=\normalfont}
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat title=allcaps can lead to problems%
+        Be aware that titleformat-title=allcaps can lead to problems%
       }
     },
 }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{titleformat subtitle}
+% \begin{macro}{titleformat-subtitle}
 % Control the titleformat of the subtitle
 %    \begin{macrocode}
 \pgfkeys{
-  /metropolis/inner/titleformat subtitle/.cd,
+  /metropolis/inner/titleformat-subtitle/.cd,
     .is choice,
     regular/.code={%
       \let\metropolis@subtitleformat\@empty%
@@ -114,25 +114,25 @@
       \let\metropolis@subtitleformat\MakeLowercase%
       \setbeamerfont{subtitle}{shape=\scshape}%
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat subtitle=allsmallcaps can lead to problems%
+        Be aware that titleformat-subtitle=allsmallcaps can lead to problems%
       }
     },
     allcaps/.code={%
       \let\metropolis@subtitleformat\MakeUppercase%
       \setbeamerfont{subtitle}{shape=\normalfont}%
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat subtitle=allcaps can lead to problems%
+        Be aware that titleformat-subtitle=allcaps can lead to problems%
       }
     },
 }
 %    \end{macrocode}
 % \end{macro}
 %
-% \begin{macro}{titleformat section}
+% \begin{macro}{titleformat-section}
 % Control the titleformat of the section title
 %    \begin{macrocode}
 \pgfkeys{
-  /metropolis/inner/titleformat section/.cd,
+  /metropolis/inner/titleformat-section/.cd,
     .is choice,
     regular/.code={%
       \let\metropolis@sectiontitleformat\@empty%
@@ -146,14 +146,14 @@
       \let\metropolis@sectiontitleformat\MakeLowercase%
       \setbeamerfont{section title}{shape=\scshape}%
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat section=allsmallcaps can lead to problems%
+        Be aware that titleformat-section=allsmallcaps can lead to problems%
       }
     },
     allcaps/.code={%
       \let\metropolis@sectiontitleformat\MakeUppercase%
       \setbeamerfont{section title}{shape=\normalfont}%
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat section=allcaps can lead to problems%
+        Be aware that titleformat-section=allcaps can lead to problems%
       }
     },
 }
@@ -180,9 +180,9 @@
   \pgfkeys{/metropolis/inner/.cd,
     sectionpage=progressbar,
     block=transparent,
-    titleformat title=regular,
-    titleformat subtitle=regular,
-    titleformat section=regular,
+    titleformat-title=regular,
+    titleformat-subtitle=regular,
+    titleformat-section=regular,
   }
 }
 %    \end{macrocode}
diff --git a/source/beamerouterthememetropolis.dtx b/source/beamerouterthememetropolis.dtx
index 2f54340..14a3656 100644
--- a/source/beamerouterthememetropolis.dtx
+++ b/source/beamerouterthememetropolis.dtx
@@ -90,7 +90,7 @@
 % Control the titleformat of the frame title
 %    \begin{macrocode}
 \pgfkeys{
-  /metropolis/outer/titleformat frame/.cd,
+  /metropolis/outer/titleformat-frame/.cd,
     .is choice,
     regular/.code={%
       \let\metropolis@frametitleformat\@empty%
@@ -113,7 +113,7 @@
         \vphantom{abcdefghijklmnopqrstuvwxyz}%
       }
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat frame=allsmallcaps can lead to problems%
+        Be aware that titleformat-frame=allsmallcaps can lead to problems%
       }
     },
     allcaps/.code={%
@@ -123,7 +123,7 @@
         \vphantom{ABCDEFGHIJKLMNOPQRSTUVWXYZ}%
       }
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat frame=allcaps can lead to problems%
+        Be aware that titleformat-frame=allcaps can lead to problems%
       }
     },
 }
@@ -137,7 +137,7 @@
   \pgfkeys{/metropolis/outer/.cd,
     numbering=counter,
     progressbar=none,
-    titleformat frame=regular,
+    titleformat-frame=regular,
   }
 }
 %    \end{macrocode}%
diff --git a/source/beamerthememetropolis.dtx b/source/beamerthememetropolis.dtx
index 56bf1ab..608e450 100644
--- a/source/beamerthememetropolis.dtx
+++ b/source/beamerthememetropolis.dtx
@@ -69,11 +69,11 @@
 }
 %    \end{macrocode}
 %
-% \begin{macro}{titleformat plain}
 % Control the titleformat of the plain title
+% \begin{macro}{titleformat-plain}
 %    \begin{macrocode}
 \pgfkeys{
-  /metropolis/titleformat plain/.cd,
+  /metropolis/titleformat-plain/.cd,
     .is choice,
     regular/.code={%
       \let\metropolis@plaintitleformat\@empty%
@@ -87,14 +87,14 @@
       \let\metropolis@plaintitleformat\MakeLowercase%
       \setbeamerfont{plain title}{shape=\scshape}%
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat plain=allsmallcaps can lead to problems%
+        Be aware that titleformat-plain=allsmallcaps can lead to problems%
       }
     },
     allcaps/.code={%
       \let\metropolis@plaintitleformat\MakeUppercase%
       \setbeamerfont{plain title}{shape=\normalfont}%
       \PackageWarning{beamerthememetropolis}{%
-        Be aware that titleformat plain=allcaps can lead to problems%
+        Be aware that titleformat-plain=allcaps can lead to problems%
       }
     },
 }
@@ -106,11 +106,11 @@
 %    \begin{macrocode}
 \pgfkeys{
   /metropolis/titleformat/.code=\pgfkeysalso{
-      inner/titleformat title=#1,
-      inner/titleformat subtitle=#1,
-      inner/titleformat section=#1,
-      outer/titleformat frame=#1,
-      titleformat plain=#1,
+      inner/titleformat-title=#1,
+      inner/titleformat-subtitle=#1,
+      inner/titleformat-section=#1,
+      outer/titleformat-frame=#1,
+      titleformat-plain=#1,
     }
 }
 %    \end{macrocode}
@@ -135,7 +135,7 @@
 %    \begin{macrocode}
 \newcommand{\metropolis@setdefaults}{
   \pgfkeys{/metropolis/.cd,
-    titleformat plain=regular,
+    titleformat-plain=regular,
   }
 }
 %    \end{macrocode}