--- a/mercurial.tex
+++ b/mercurial.tex
@@ -72,8 +72,8 @@
 \title{Fast, Flexible and Fun\\ Revision Control with Mercurial}
 \author{Martin Geisler}
 
-\newcommand{\hgcmd}[1]{\texttt{\color{green!50!black}#1}}
-\newcommand{\hgext}[1]{\texttt{#1}}
+\newcommand{\cmd}[1]{\texttt{\color{green!50!black}#1}}
+\newcommand{\ext}[1]{\texttt{#1}}
 
 \begin{document}
 
@@ -245,7 +245,7 @@
 \end{frame}
 
 \begin{frame}{SVN Merge in Client}
-  When you do \hgcmd{svn update}, you merge:
+  When you do \cmd{svn update}, you merge:
   \begin{itemize}
   \item this can of course result in conflicts
   \item you must resolve the merge before you go on
@@ -618,12 +618,12 @@
 \end{frame}
 
 \begin{frame}[fragile]{Making a Commit}
-We can now commit the changes shown by \hgcmd{hg status}:
+We can now commit the changes shown by \cmd{hg status}:
 \begin{lstlisting}
 % hg commit -m "Imported source code."
 \end{lstlisting}
 
-The changeset is shown in \hgcmd{hg log}:
+The changeset is shown in \cmd{hg log}:
 \begin{lstlisting}
 % hg log
 changeset:   0:9cef08a0e941
@@ -737,7 +737,7 @@
         \node<3->[rev] {};
       \end{scope}
 
-      \draw<3->[short,->] (a-end) -- node[below] {\hgcmd{hg push}} (b-begin);
+      \draw<3->[short,->] (a-end) -- node[below] {\cmd{hg push}} (b-begin);
 
       \begin{pgfonlayer}{background}
         \node<3>[highlight, fit=(b-3) (b-4)] {};
@@ -772,13 +772,13 @@
         \node<5>[highlight, fit=(b-3) (b-4)] {};
       \end{pgfonlayer}
 
-      \draw<6->[short,->] (b-begin) -- node[below] {\hgcmd{hg pull}} (a-end);
+      \draw<6->[short,->] (b-begin) -- node[below] {\cmd{hg pull}} (a-end);
 
     \end{tikzpicture}
 
-  \item<7-> \hgcmd{hg push} and \hgcmd{hg pull} are symmetric
+  \item<7-> \cmd{hg push} and \cmd{hg pull} are symmetric
 
-  \item<7-> \hgcmd{hg clone} $=$ \hgcmd{hg init} $+$ \hgcmd{hg pull}\\
+  \item<7-> \cmd{hg clone} $=$ \cmd{hg init} $+$ \cmd{hg pull}\\
     (but more space-efficient on local disks)
   \end{itemize}
 \end{frame}
@@ -789,9 +789,9 @@
 \begin{frame}{Searching History}
   Everything is local and fast:
   \begin{itemize}
-  \item \hgcmd{hg log} can search in commit messages and usernames
-  \item \hgcmd{hg grep} seaches in file content
-  \item \hgcmd{hg bisect} makes a binary search on the revision graph
+  \item \cmd{hg log} can search in commit messages and usernames
+  \item \cmd{hg grep} seaches in file content
+  \item \cmd{hg bisect} makes a binary search on the revision graph
   \end{itemize}
 \end{frame}
 
@@ -810,12 +810,12 @@
   \end{itemize}
 
   % \begin{itemize}
-  % \item \hgext{bugzilla} integrates with Bugzilla
-  % \item \hgext{color} enables  color output in terminals
-  % \item \hgext{gpg} manages GnuPG digital signatures
-  % \item \hgext{inotify} gives instant file status on Linux 2.6
-  % \item \hgext{keyword} expands keywords in working copy
-  % \item \hgext{parentrevspec} changes syntax for revisions
+  % \item \ext{bugzilla} integrates with Bugzilla
+  % \item \ext{color} enables  color output in terminals
+  % \item \ext{gpg} manages GnuPG digital signatures
+  % \item \ext{inotify} gives instant file status on Linux 2.6
+  % \item \ext{keyword} expands keywords in working copy
+  % \item \ext{parentrevspec} changes syntax for revisions
   % \end{itemize}
 \end{frame}
 
@@ -825,7 +825,7 @@
   \tikzstyle{rev}+=[on chain, join, minimum size=5mm]
   \tikzset{node distance=4mm and 6mm}
 
-  Tired of all those merges? Use the \hgext{rebase} extension!
+  Tired of all those merges? Use the \ext{rebase} extension!
   \begin{itemize}
   \item Revision graph:
 
@@ -882,7 +882,7 @@
 \end{frame}
 
 \begin{frame}{Maintaining Patch Series}
-  The \hgext{mq} extension makes it easy to maintain a patch series:
+  The \ext{mq} extension makes it easy to maintain a patch series:
 
   \begin{center}
     \begin{tikzpicture}[start chain=stack going above, node distance=5mm]
@@ -898,10 +898,10 @@
       \node<4->[patch] {doc};
 
       \draw<5->[->] ([xshift=-1cm] stack-3.center)
-        -- node[left, anchor=mid east] {\hgcmd{qpush}}
+        -- node[left, anchor=mid east] {\cmd{qpush}}
                     ([xshift=-1cm] stack-5.center);
       \draw<5->[->] ([xshift=1cm] stack-5.center)
-        -- node[right, anchor=mid west] {\hgcmd{qpop}}
+        -- node[right, anchor=mid west] {\cmd{qpop}}
                     ([xshift=1cm] stack-3.center);
     \end{tikzpicture}
   \end{center}
@@ -913,7 +913,7 @@
   \tikzstyle{squiggle}=[on chain, font=\large, red]
   \tikzset{node distance=5mm}
 
-  Inspired by \hgcmd{git rebase -i}, \hgext{histedit} lets you
+  Inspired by \cmd{git rebase -i}, \ext{histedit} lets you
   \begin{itemize}[<+->]
   \item reorder changesets:
 
@@ -967,7 +967,7 @@
 \subsection{Migrating History}
 
 \begin{frame}{Migrating History}
-  The \hgext{convert} extension can import history:
+  The \ext{convert} extension can import history:
   \begin{itemize}
     \item CVS, SVN, Git, Bazaar, Darcs, \dots
     \item incremental conversion
@@ -975,22 +975,22 @@
   \end{itemize}
   \pause
 
-  Interestingly, \hgext{convert} can import from Mercurial:
+  Interestingly, \ext{convert} can import from Mercurial:
   \begin{itemize}
     % Break "--" to avoid them forming an en-dash...
-  \item \hgcmd{-{}-filemap} lets you exclude and rename files
-  \item \hgcmd{-{}-branchmap} lets you rename branches
+  \item \cmd{-{}-filemap} lets you exclude and rename files
+  \item \cmd{-{}-branchmap} lets you rename branches
   \end{itemize}
 \end{frame}
 
 \subsection{Bi-Directional Gateways}
 
 \begin{frame}{Interfacing with Subversion}
-  The \hgext{hgsubversion} extension let's you:
+  The \ext{hgsubversion} extension let's you:
   \begin{itemize}
-  \item use \hgcmd{hg clone} on a SVN URLs
-  \item use \hgcmd{hg pull} to convert new SVN revisions
-  \item use \hgcmd{hg push} to commit changesets to SVN server
+  \item use \cmd{hg clone} on a SVN URLs
+  \item use \cmd{hg pull} to convert new SVN revisions
+  \item use \cmd{hg push} to commit changesets to SVN server
   \end{itemize}
 
   The extension is being used, but please note:
@@ -1007,9 +1007,9 @@
 \end{frame}
 
 \begin{frame}{Interfacing with Git}
-  Need to work on a Git repository? Try \hgext{hg-git}!
+  Need to work on a Git repository? Try \ext{hg-git}!
   \begin{itemize}
-  \item Mercurial extension: you get the nice \hgcmd{hg} command line
+  \item Mercurial extension: you get the nice \cmd{hg} command line
   \item round-tripping: changeset hashes are preserved
   \end{itemize}