diff --git a/appendices/migration54.xml b/appendices/migration54.xml
index 9b7944626f..046fcf6894 100644
--- a/appendices/migration54.xml
+++ b/appendices/migration54.xml
@@ -426,7 +426,7 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     <classname>MySQLi_Result</classname> now implements
+     <classname>mysqli_result</classname> now implements
      <classname>Traversable</classname>.
     </simpara>
    </listitem>
diff --git a/reference/mysqli/functions/mysqli-report.xml b/reference/mysqli/functions/mysqli-report.xml
index 79a447261f..93bef03a26 100644
--- a/reference/mysqli/functions/mysqli-report.xml
+++ b/reference/mysqli/functions/mysqli-report.xml
@@ -140,7 +140,7 @@ $mysqli->close();
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><link linkend="mysqli-driver.props.report-mode">MySQLi_Driver::$report_mode</link></member>
+    <member><link linkend="mysqli-driver.props.report-mode">mysqli_driver::$report_mode</link></member>
     <member><function>mysqli_debug</function></member>
     <member><function>mysqli_dump_debug_info</function></member>
    </simplelist>
diff --git a/reference/mysqli/mysqli.xml b/reference/mysqli/mysqli.xml
index f91f9f6424..0a17d2c26c 100644
--- a/reference/mysqli/mysqli.xml
+++ b/reference/mysqli/mysqli.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.mysqli" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The MySQLi class</title>
- <titleabbrev>MySQLi</titleabbrev>
+ <title>The mysqli class</title>
+ <titleabbrev>mysqli</titleabbrev>
  
  <partintro>
  
@@ -20,12 +20,12 @@
  
 <!-- {{{ Synopsis -->
    <classsynopsis>
-    <ooclass><classname>MySQLi</classname></ooclass>
+    <ooclass><classname>mysqli</classname></ooclass>
  
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
      <ooclass>
-      <classname>MySQLi</classname>
+      <classname>mysqli</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mysqli/mysqli/query.xml b/reference/mysqli/mysqli/query.xml
index 0197c612df..a6ee4099bc 100644
--- a/reference/mysqli/mysqli/query.xml
+++ b/reference/mysqli/mysqli/query.xml
@@ -112,7 +112,7 @@
   <para>
    Returns &false; on failure. For successful <literal>SELECT, SHOW, DESCRIBE</literal> or
    <literal>EXPLAIN</literal> queries <function>mysqli_query</function> will return
-   a <classname>MySQLi_Result</classname> object. For other successful queries <function>mysqli_query</function> will
+   a <classname>mysqli_result</classname> object. For other successful queries <function>mysqli_query</function> will
    return &true;.
   </para>
  </refsect1>
diff --git a/reference/mysqli/mysqli_driver.xml b/reference/mysqli/mysqli_driver.xml
index 19a157d265..59848627f9 100644
--- a/reference/mysqli/mysqli_driver.xml
+++ b/reference/mysqli/mysqli_driver.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.mysqli-driver" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The MySQLi_Driver class</title>
- <titleabbrev>MySQLi_Driver</titleabbrev>
+ <title>The mysqli_driver class</title>
+ <titleabbrev>mysqli_driver</titleabbrev>
  
  <partintro>
  
@@ -20,12 +20,12 @@
  
 <!-- {{{ Synopsis -->
    <classsynopsis>
-    <ooclass><classname>MySQLi_Driver</classname></ooclass>
+    <ooclass><classname>mysqli_driver</classname></ooclass>
  
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
      <ooclass>
-      <classname>MySQLi_Driver</classname>
+      <classname>mysqli_driver</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
@@ -72,7 +72,7 @@
 <!-- }}} -->
  
   </section>
-<!-- {{{ MySQLi_Driver properties -->
+<!-- {{{ mysqli_driver properties -->
   <section xml:id="mysqli-driver.props">
    &reftitle.properties;
    <variablelist>
diff --git a/reference/mysqli/mysqli_result.xml b/reference/mysqli/mysqli_result.xml
index 5ae52c887f..829dcb63fb 100644
--- a/reference/mysqli/mysqli_result.xml
+++ b/reference/mysqli/mysqli_result.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.mysqli-result" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The MySQLi_Result class</title>
- <titleabbrev>MySQLi_Result</titleabbrev>
+ <title>The mysqli_result class</title>
+ <titleabbrev>mysqli_result</titleabbrev>
  
  <partintro>
  
@@ -30,7 +30,7 @@
       <row>
        <entry>5.4.0</entry>
        <entry>
-        <classname>Iterator</classname> support was added, as <classname>MySQLi_Result</classname>
+        <classname>Iterator</classname> support was added, as <classname>mysqli_result</classname>
         now implements <classname>Traversable</classname>.
        </entry>
       </row>
@@ -46,12 +46,12 @@
  
 <!-- {{{ Synopsis -->
    <classsynopsis>
-    <ooclass><classname>MySQLi_Result</classname></ooclass>
+    <ooclass><classname>mysqli_result</classname></ooclass>
  
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
      <ooclass>
-      <classname>MySQLi_Result</classname>
+      <classname>mysqli_result</classname>
      </ooclass>
 
      <oointerface>
diff --git a/reference/mysqli/mysqli_result/fetch-assoc.xml b/reference/mysqli/mysqli_result/fetch-assoc.xml
index bffd6a1150..0f4c3f74bb 100644
--- a/reference/mysqli/mysqli_result/fetch-assoc.xml
+++ b/reference/mysqli/mysqli_result/fetch-assoc.xml
@@ -128,7 +128,7 @@ Santa Clara (USA)
    </screen>
   </example>
   <example xml:id="mysqli-result.example.iterator">
-   <title>A <classname>MySQLi_Result</classname> example comparing <classname>iterator</classname> usage</title>
+   <title>A <classname>mysqli_result</classname> example comparing <classname>iterator</classname> usage</title>
    <programlisting role="php">
 <![CDATA[
 <?php
diff --git a/reference/mysqli/mysqli_stmt.xml b/reference/mysqli/mysqli_stmt.xml
index 1bfd6a61b2..8a1e274ace 100644
--- a/reference/mysqli/mysqli_stmt.xml
+++ b/reference/mysqli/mysqli_stmt.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.mysqli-stmt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The MySQLi_STMT class</title>
- <titleabbrev>MySQLi_STMT</titleabbrev>
+ <title>The mysqli_stmt class</title>
+ <titleabbrev>mysqli_stmt</titleabbrev>
  
  <partintro>
  
@@ -20,12 +20,12 @@
  
 <!-- {{{ Synopsis -->
    <classsynopsis>
-    <ooclass><classname>MySQLi_STMT</classname></ooclass>
+    <ooclass><classname>mysqli_stmt</classname></ooclass>
  
 <!-- {{{ Class synopsis -->
     <classsynopsisinfo>
      <ooclass>
-      <classname>MySQLi_STMT</classname>
+      <classname>mysqli_stmt</classname>
      </ooclass>
     </classsynopsisinfo>
 <!-- }}} -->
diff --git a/reference/mysqli/mysqli_warning.xml b/reference/mysqli/mysqli_warning.xml
index 01b02824ec..087c0b2328 100644
--- a/reference/mysqli/mysqli_warning.xml
+++ b/reference/mysqli/mysqli_warning.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.mysqli-warning" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
- <title>The MySQLi_Warning class</title>
- <titleabbrev>MySQLi_Warning</titleabbrev>
+ <title>The mysqli_warning class</title>
+ <titleabbrev>mysqli_warning</titleabbrev>
  
  <partintro>
  
diff --git a/reference/mysqli/summary.xml b/reference/mysqli/summary.xml
index fb8c95348a..eacdc623f8 100644
--- a/reference/mysqli/summary.xml
+++ b/reference/mysqli/summary.xml
@@ -8,7 +8,7 @@
   <tgroup cols="4">
    <thead>
     <row>
-     <entry>MySQLi Class</entry>
+     <entry>mysqli Class</entry>
     </row>
     <row>
      <entry>OOP Interface</entry>
@@ -562,7 +562,7 @@
   <tgroup cols="4">
    <thead>
     <row>
-     <entry>MySQLi_RESULT</entry>
+     <entry>mysqli_result</entry>
     </row>
     <row>
      <entry>OOP Interface</entry>