diff --git a/reference/xml/functions/xml-get-current-byte-index.xml b/reference/xml/functions/xml-get-current-byte-index.xml
index 179fd0c6b1..814f9a9a5d 100644
--- a/reference/xml/functions/xml-get-current-byte-index.xml
+++ b/reference/xml/functions/xml-get-current-byte-index.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_current_byte_index</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the current byte index of the given XML parser.
diff --git a/reference/xml/functions/xml-get-current-column-number.xml b/reference/xml/functions/xml-get-current-column-number.xml
index a328ab0ffd..38f827f790 100644
--- a/reference/xml/functions/xml-get-current-column-number.xml
+++ b/reference/xml/functions/xml-get-current-column-number.xml
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_current_column_number</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the current column number of the given XML parser.
diff --git a/reference/xml/functions/xml-get-current-line-number.xml b/reference/xml/functions/xml-get-current-line-number.xml
index cfd26d37a9..060c45adab 100644
--- a/reference/xml/functions/xml-get-current-line-number.xml
+++ b/reference/xml/functions/xml-get-current-line-number.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_current_line_number</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the current line number for the given XML parser.
diff --git a/reference/xml/functions/xml-get-error-code.xml b/reference/xml/functions/xml-get-error-code.xml
index 03a67beff3..d2184cdc3a 100644
--- a/reference/xml/functions/xml-get-error-code.xml
+++ b/reference/xml/functions/xml-get-error-code.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_get_error_code</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Gets the XML parser error code.
diff --git a/reference/xml/functions/xml-parse-into-struct.xml b/reference/xml/functions/xml-parse-into-struct.xml
index 71bf7441ad..8844cbb046 100644
--- a/reference/xml/functions/xml-parse-into-struct.xml
+++ b/reference/xml/functions/xml-parse-into-struct.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_parse_into_struct</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam><type>array</type><parameter role="reference">values</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter role="reference">index</parameter><initializer>&null;</initializer></methodparam>
diff --git a/reference/xml/functions/xml-parse.xml b/reference/xml/functions/xml-parse.xml
index ff0e753a6d..10d05f54f3 100644
--- a/reference/xml/functions/xml-parse.xml
+++ b/reference/xml/functions/xml-parse.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>int</type><methodname>xml_parse</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>string</type><parameter>data</parameter></methodparam>
    <methodparam choice="opt"><type>bool</type><parameter>is_final</parameter><initializer>&false;</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-parser-create-ns.xml b/reference/xml/functions/xml-parser-create-ns.xml
index 7dacb6131f..f3e00e2dbd 100644
--- a/reference/xml/functions/xml-parser-create-ns.xml
+++ b/reference/xml/functions/xml-parser-create-ns.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>XmlParser</type><methodname>xml_parser_create_ns</methodname>
+   <type>XMLParser</type><methodname>xml_parser_create_ns</methodname>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
    <methodparam choice="opt"><type>string</type><parameter>separator</parameter><initializer>":"</initializer></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-parser-create.xml b/reference/xml/functions/xml-parser-create.xml
index b313414ed4..858e39a32c 100644
--- a/reference/xml/functions/xml-parser-create.xml
+++ b/reference/xml/functions/xml-parser-create.xml
@@ -9,7 +9,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <type>XmlParser</type><methodname>xml_parser_create</methodname>
+   <type>XMLParser</type><methodname>xml_parser_create</methodname>
    <methodparam choice="opt"><type class="union"><type>string</type><type>null</type></type><parameter>encoding</parameter><initializer>&null;</initializer></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-parser-free.xml b/reference/xml/functions/xml-parser-free.xml
index 426df7c6fa..9af20ce25d 100644
--- a/reference/xml/functions/xml-parser-free.xml
+++ b/reference/xml/functions/xml-parser-free.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_parser_free</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
   </methodsynopsis>
   <para>
    Frees the given XML <parameter>parser</parameter>.
diff --git a/reference/xml/functions/xml-parser-get-option.xml b/reference/xml/functions/xml-parser-get-option.xml
index ac2635f9ba..aad6fd9a91 100644
--- a/reference/xml/functions/xml-parser-get-option.xml
+++ b/reference/xml/functions/xml-parser-get-option.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type class="union"><type>string</type><type>int</type></type><methodname>xml_parser_get_option</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-parser-set-option.xml b/reference/xml/functions/xml-parser-set-option.xml
index 8552274a6d..a1d13caf33 100644
--- a/reference/xml/functions/xml-parser-set-option.xml
+++ b/reference/xml/functions/xml-parser-set-option.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_parser_set_option</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>int</type><parameter>option</parameter></methodparam>
    <methodparam><type class="union"><type>string</type><type>int</type></type><parameter>value</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-character-data-handler.xml b/reference/xml/functions/xml-set-character-data-handler.xml
index 16b0545fac..7fc44e8dd5 100644
--- a/reference/xml/functions/xml-set-character-data-handler.xml
+++ b/reference/xml/functions/xml-set-character-data-handler.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_character_data_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -44,7 +44,7 @@
        two parameters:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>data</parameter></methodparam>
        </methodsynopsis>
        <variablelist>
diff --git a/reference/xml/functions/xml-set-default-handler.xml b/reference/xml/functions/xml-set-default-handler.xml
index 9a1540c1b9..9c50e61c1e 100644
--- a/reference/xml/functions/xml-set-default-handler.xml
+++ b/reference/xml/functions/xml-set-default-handler.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_default_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -44,7 +44,7 @@
        two parameters:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>data</parameter></methodparam>
        </methodsynopsis>
        <variablelist>
diff --git a/reference/xml/functions/xml-set-element-handler.xml b/reference/xml/functions/xml-set-element-handler.xml
index aa1aafc213..d917a6f7e2 100644
--- a/reference/xml/functions/xml-set-element-handler.xml
+++ b/reference/xml/functions/xml-set-element-handler.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_element_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>start_handler</parameter></methodparam>
    <methodparam><type>callable</type><parameter>end_handler</parameter></methodparam>
   </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-end-namespace-decl-handler.xml b/reference/xml/functions/xml-set-end-namespace-decl-handler.xml
index af53118f08..c4a97e2d80 100644
--- a/reference/xml/functions/xml-set-end-namespace-decl-handler.xml
+++ b/reference/xml/functions/xml-set-end-namespace-decl-handler.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_end_namespace_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -56,7 +56,7 @@
        <constant>XML_ERROR_EXTERNAL_ENTITY_HANDLING</constant>.
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
        </methodsynopsis>
        <variablelist>
diff --git a/reference/xml/functions/xml-set-external-entity-ref-handler.xml b/reference/xml/functions/xml-set-external-entity-ref-handler.xml
index 65fa0a28ff..f8d853c6f5 100644
--- a/reference/xml/functions/xml-set-external-entity-ref-handler.xml
+++ b/reference/xml/functions/xml-set-external-entity-ref-handler.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_external_entity_ref_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -48,7 +48,7 @@
        <constant>XML_ERROR_EXTERNAL_ENTITY_HANDLING</constant>.
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>open_entity_names</parameter></methodparam>
         <methodparam><type>string</type><parameter>base</parameter></methodparam>
         <methodparam><type>string</type><parameter>system_id</parameter></methodparam>
diff --git a/reference/xml/functions/xml-set-notation-decl-handler.xml b/reference/xml/functions/xml-set-notation-decl-handler.xml
index 1d853054cd..e64f8ff027 100644
--- a/reference/xml/functions/xml-set-notation-decl-handler.xml
+++ b/reference/xml/functions/xml-set-notation-decl-handler.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_notation_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -56,7 +56,7 @@
        five parameters:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>notation_name</parameter></methodparam>
         <methodparam><type>string</type><parameter>base</parameter></methodparam>
         <methodparam><type>string</type><parameter>system_id</parameter></methodparam>
diff --git a/reference/xml/functions/xml-set-object.xml b/reference/xml/functions/xml-set-object.xml
index 262d7a1100..3e8f411c29 100644
--- a/reference/xml/functions/xml-set-object.xml
+++ b/reference/xml/functions/xml-set-object.xml
@@ -10,7 +10,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_object</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>object</type><parameter>object</parameter></methodparam>
   </methodsynopsis>
   <para>
diff --git a/reference/xml/functions/xml-set-processing-instruction-handler.xml b/reference/xml/functions/xml-set-processing-instruction-handler.xml
index 00e4284e49..c331e28206 100644
--- a/reference/xml/functions/xml-set-processing-instruction-handler.xml
+++ b/reference/xml/functions/xml-set-processing-instruction-handler.xml
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_processing_instruction_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -59,7 +59,7 @@
        three parameters:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>target</parameter></methodparam>
         <methodparam><type>string</type><parameter>data</parameter></methodparam>
        </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-start-namespace-decl-handler.xml b/reference/xml/functions/xml-set-start-namespace-decl-handler.xml
index 2cb7165a2d..ee6691734c 100644
--- a/reference/xml/functions/xml-set-start-namespace-decl-handler.xml
+++ b/reference/xml/functions/xml-set-start-namespace-decl-handler.xml
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_start_namespace_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -52,7 +52,7 @@
        <constant>XML_ERROR_EXTERNAL_ENTITY_HANDLING</constant>.
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>prefix</parameter></methodparam>
         <methodparam><type>string</type><parameter>uri</parameter></methodparam>
        </methodsynopsis>
diff --git a/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml b/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml
index 245774b3b6..6d8c838cd5 100644
--- a/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml
+++ b/reference/xml/functions/xml-set-unparsed-entity-decl-handler.xml
@@ -12,7 +12,7 @@
   &reftitle.description;
   <methodsynopsis>
    <type>bool</type><methodname>xml_set_unparsed_entity_decl_handler</methodname>
-   <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+   <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
    <methodparam><type>callable</type><parameter>handler</parameter></methodparam>
   </methodsynopsis>
   <para>
@@ -62,7 +62,7 @@
        parameters:
        <methodsynopsis>
         <methodname><replaceable>handler</replaceable></methodname>
-        <methodparam><type>XmlParser</type><parameter>parser</parameter></methodparam>
+        <methodparam><type>XMLParser</type><parameter>parser</parameter></methodparam>
         <methodparam><type>string</type><parameter>entity_name</parameter></methodparam>
         <methodparam><type>string</type><parameter>base</parameter></methodparam>
         <methodparam><type>string</type><parameter>system_id</parameter></methodparam>