diff --git a/reference/mysqlnd_uh/changes.xml b/reference/mysqlnd_uh/changes.xml
index 28e174ee8c..8999050024 100644
--- a/reference/mysqlnd_uh/changes.xml
+++ b/reference/mysqlnd_uh/changes.xml
@@ -42,14 +42,14 @@
     </listitem>
     <listitem>
      <simpara>
-      BC break: <literal>MysqlndUhConnection::changeUser()</literal> requires
+      BC break: <methodname>MysqlndUhConnection::changeUser</methodname> requires
       additional <literal>passwd_len</literal> parameter.
      </simpara>
     </listitem>
     <listitem>
      <simpara>
-      BC break: <literal>MYSQLND_UH_VERSION_STR</literal> renamed to <literal>MYSQLND_UH_VERSION</literal>.
-      <literal>MYSQLND_UH_VERSION</literal> renamed to <literal>MYSQLND_UH_VERSION_ID</literal>.
+      BC break: <constant>MYSQLND_UH_VERSION_STR</constant> renamed to <constant>MYSQLND_UH_VERSION</constant>.
+      <constant>MYSQLND_UH_VERSION</constant> renamed to <constant>MYSQLND_UH_VERSION_ID</constant>.
      </simpara>
     </listitem>
     <listitem>
diff --git a/reference/mysqlnd_uh/constants.xml b/reference/mysqlnd_uh/constants.xml
index bc04f77d48..b1f6a53bf7 100644
--- a/reference/mysqlnd_uh/constants.xml
+++ b/reference/mysqlnd_uh/constants.xml
@@ -10,11 +10,11 @@
   To avoid content duplication, only short descriptions are given.
  </para>
  <para>
-  <emphasis role="bold">MysqlndUhConnection::simpleCommand() related</emphasis>
+  <emphasis role="bold"><methodname>MysqlndUhConnection::simpleCommand</methodname> related</emphasis>
  </para>
  <para>
   The following constants can be used to detect what command is to be send
-  through <literal>MysqlndUhConnection::simpleCommand()</literal>.
+  through <methodname>MysqlndUhConnection::simpleCommand</methodname>.
  </para>
  <para>
   <variablelist>
@@ -363,7 +363,7 @@
  </para>
  <para>
   The following constants can be used to analyze the <literal>ok_packet</literal>
-  argument of <literal>MysqlndUhConnection::simpleCommand()</literal>.
+  argument of <methodname>MysqlndUhConnection::simpleCommand</methodname>.
  </para>
  <para>
   <variablelist>
@@ -503,7 +503,7 @@
  </para>
 
  <para>
-  <emphasis role="bold">MysqlndUhConnection::close() related</emphasis>
+  <emphasis role="bold"><methodname>MysqlndUhConnection::close</methodname> related</emphasis>
  </para>
  <para>
   The following constants can be used to detect why a connection has been
@@ -593,11 +593,11 @@
  </para>
 
  <para>
-  <emphasis role="bold">MysqlndUhConnection::setClientOption() related</emphasis>
+  <emphasis role="bold"><methodname>MysqlndUhConnection::setClientOption</methodname> related</emphasis>
  </para>
  <para>
   The following constants can be used to detect which option is set through
-  <literal>MysqlndUhConnection::setClientOption()</literal>.
+  <methodname>MysqlndUhConnection::setClientOption</methodname>.
  </para>
  <para>
   <variablelist>
@@ -1037,7 +1037,7 @@
       <entry>0 = 0</entry>
      </row>
      <row>
-      <entry>MYSQLND_UH_VERSION_ID</entry>
+      <entry><constant>MYSQLND_UH_VERSION_ID</constant></entry>
       <entry>10000</entry>
      </row>
     </tbody>
diff --git a/reference/mysqlnd_uh/ini.xml b/reference/mysqlnd_uh/ini.xml
index d7db7d4201..e42682ec16 100644
--- a/reference/mysqlnd_uh/ini.xml
+++ b/reference/mysqlnd_uh/ini.xml
@@ -60,7 +60,7 @@
      <listitem>
       <para>
        Wheter to report wrong return value types of user hooks as error
-       of the type <literal>E_WARNING</literal>. It is strongly recommended
+       of the type <constant>E_WARNING</constant>. It is strongly recommended
        to use this setting for detecting possible issues.
       </para>
      </listitem>
diff --git a/reference/mysqlnd_uh/quickstart.xml b/reference/mysqlnd_uh/quickstart.xml
index b61c3ca667..ba210b8889 100644
--- a/reference/mysqlnd_uh/quickstart.xml
+++ b/reference/mysqlnd_uh/quickstart.xml
@@ -88,7 +88,7 @@ mysqlnd_uh.report_wrong_types=1
    you access almost all methods of the <literal>mysqlnd</literal>
    internal <literal>connection</literal> class. The latter exposes some, selected
    methods of the  <literal>mysqlnd</literal> internal <literal>statement</literal> class.
-   For example, <function>MysqlndUhConnection::connect</function> maps to
+   For example, <methodname>MysqlndUhConnection::connect</methodname> maps to
    the <literal>mysqlnd</literal> library C function
    <literal>mysqlnd_conn__connect</literal>.
   </para>
@@ -402,7 +402,7 @@ array(1) {
   <para>
    All native prepared statements are prepared with the <literal>prepare</literal>
    method of <literal>mysqlnd</literal> exported through
-   <function>MysqlndUhPreparedStatement::prepare</function>. Subclass
+   <methodname>MysqlndUhPreparedStatement::prepare</methodname>. Subclass
    <classname>MysqlndUhPreparedStatement</classname> and overwrite <literal>prepare</literal>
    for native prepared statement monitoring.
   </para>