diff --git a/doc/guide.html b/doc/guide.html
index 03e3700ec..3a434a12e 100644
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -3407,7 +3407,7 @@ Available commands in this ejabberd node:
   ...
 </PRE><P>The more interesting ones are:
 </P><DL CLASS="description"><DT CLASS="dt-description">
-<B><TT>reopen-log</TT></B></DT><DD CLASS="dd-description"> Reopen the log files after they were renamed.
+<B><TT>reopen_log</TT></B></DT><DD CLASS="dd-description"> Reopen the log files after they were renamed.
 If the old files were not renamed before calling this command,
 they are automatically renamed to <TT>"*-old.log"</TT>. See section <A HREF="#logfiles">7.1</A>.
 </DD><DT CLASS="dt-description"><B><TT>backup ejabberd.backup</TT></B></DT><DD CLASS="dd-description">
@@ -3415,7 +3415,7 @@ Store internal Mnesia database to a binary backup file.
 </DD><DT CLASS="dt-description"><B><TT>restore ejabberd.backup</TT></B></DT><DD CLASS="dd-description">
 Restore immediately from a binary backup file the internal Mnesia database.
 This will consume quite some memory for big servers.
-</DD><DT CLASS="dt-description"><B><TT>install-fallback ejabberd.backup</TT></B></DT><DD CLASS="dd-description">
+</DD><DT CLASS="dt-description"><B><TT>install_fallback ejabberd.backup</TT></B></DT><DD CLASS="dd-description">
 The binary backup file is installed as fallback:
 it will be used to restore the database at the next ejabberd start.
 Similar to <TT>restore</TT>, but requires less memory.
@@ -3424,21 +3424,21 @@ Dump internal Mnesia database to a text file dump.
 </DD><DT CLASS="dt-description"><B><TT>load ejabberd.dump</TT></B></DT><DD CLASS="dd-description">
 Restore immediately from a text file dump.
 This is not recommended for big databases, as it will consume much time,
-memory and processor. In that case it&#X2019;s preferable to use <TT>backup</TT> and <TT>install-fallback</TT>.
-</DD><DT CLASS="dt-description"><B><TT>import-piefxis, export-piefxis, export-piefxis-host</TT></B></DT><DD CLASS="dd-description"> 
+memory and processor. In that case it&#X2019;s preferable to use <TT>backup</TT> and <TT>install_fallback</TT>.
+</DD><DT CLASS="dt-description"><B><TT>import_piefxis, export_piefxis, export_piefxis_host</TT></B></DT><DD CLASS="dd-description"> 
 These options can be used to migrate accounts
 using <A HREF="http://www.xmpp.org/extensions/xep-0227.html">XEP-0227</A> formatted XML files
 from/to other Jabber/XMPP servers
 or move users of a vhost to another ejabberd installation.
 See also 
 <A HREF="https://support.process-one.net/doc/display/P1/ejabberd+migration+kit">ejabberd migration kit</A>.
-</DD><DT CLASS="dt-description"><B><TT>import-file, import-dir</TT></B></DT><DD CLASS="dd-description"> 
+</DD><DT CLASS="dt-description"><B><TT>import_file, import_dir</TT></B></DT><DD CLASS="dd-description"> 
 These options can be used to migrate accounts
 using jabberd1.4 formatted XML files.
 from other Jabber/XMPP servers
 There exist tutorials to
 <A HREF="http://www.ejabberd.im/migrate-to-ejabberd">migrate from other software to ejabberd</A>.
-</DD><DT CLASS="dt-description"><B><TT>delete-expired-messages</TT></B></DT><DD CLASS="dd-description"> This option can be used to delete old messages
+</DD><DT CLASS="dt-description"><B><TT>delete_expired_messages</TT></B></DT><DD CLASS="dd-description"> This option can be used to delete old messages
 in offline storage. This might be useful when the number of offline messages
 is very high.
 </DD></DL><P> <A NAME="accesscommands"></A> </P><!--TOC subsection Restrict Execution with AccessCommands-->
diff --git a/doc/guide.tex b/doc/guide.tex
index 58a9395b7..75791d16d 100644
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -4350,7 +4350,7 @@ Available commands in this ejabberd node:
 
 The more interesting ones are:
 \begin{description}
-\titem{reopen-log} Reopen the log files after they were renamed.
+\titem{reopen\_log} Reopen the log files after they were renamed.
   If the old files were not renamed before calling this command,
   they are automatically renamed to \term{"*-old.log"}. See section \ref{logfiles}.
 \titem {backup ejabberd.backup}
@@ -4358,7 +4358,7 @@ The more interesting ones are:
 \titem {restore ejabberd.backup}
   Restore immediately from a binary backup file the internal Mnesia database.
   This will consume quite some memory for big servers.
-\titem {install-fallback ejabberd.backup}
+\titem {install\_fallback ejabberd.backup}
   The binary backup file is installed as fallback:
   it will be used to restore the database at the next ejabberd start.
   Similar to \term{restore}, but requires less memory.
@@ -4367,23 +4367,23 @@ The more interesting ones are:
 \titem {load ejabberd.dump}
   Restore immediately from a text file dump.
   This is not recommended for big databases, as it will consume much time,
-  memory and processor. In that case it's preferable to use \term{backup} and \term{install-fallback}.
+  memory and processor. In that case it's preferable to use \term{backup} and \term{install\_fallback}.
 %%More information about backuping can
 %%  be found in section~\ref{backup}.
-\titem{import-piefxis, export-piefxis, export-piefxis-host} \ind{migrate between servers}
+\titem{import\_piefxis, export\_piefxis, export\_piefxis\_host} \ind{migrate between servers}
   These options can be used to migrate accounts
   using \xepref{0227} formatted XML files
   from/to other \Jabber{}/XMPP servers
   or move users of a vhost to another ejabberd installation.
   See also 
   \footahref{https://support.process-one.net/doc/display/P1/ejabberd+migration+kit}{ejabberd migration kit}.
-\titem{import-file, import-dir} \ind{migration from other software}
+\titem{import\_file, import\_dir} \ind{migration from other software}
   These options can be used to migrate accounts
   using jabberd1.4 formatted XML files.
   from other \Jabber{}/XMPP servers
   There exist tutorials to
   \footahref{http://www.ejabberd.im/migrate-to-ejabberd}{migrate from other software to ejabberd}.
-\titem{delete-expired-messages} This option can be used to delete old messages
+\titem{delete\_expired\_messages} This option can be used to delete old messages
   in offline storage. This might be useful when the number of offline messages
   is very high.
 \end{description}