diff --git a/reference/domxml/functions/DomDocument-add-root.xml b/reference/domxml/functions/DomDocument-add-root.xml
index 58f2a6537b..c574fb7d40 100644
--- a/reference/domxml/functions/DomDocument-add-root.xml
+++ b/reference/domxml/functions/DomDocument-add-root.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.6 -->
   <refentry id="function.domdocument-add-root">
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>DomDocument->add_root</methodname>
+      <type>domelement</type><methodname>DomDocument->add_root</methodname>
       <methodparam><type>string</type><parameter>name</parameter></methodparam>
      </methodsynopsis>
     &warn.experimental.func;
diff --git a/reference/domxml/functions/DomDocument-create-attribute.xml b/reference/domxml/functions/DomDocument-create-attribute.xml
index 3fb6e8ca3e..bbe8b1a4cd 100644
--- a/reference/domxml/functions/DomDocument-create-attribute.xml
+++ b/reference/domxml/functions/DomDocument-create-attribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-attribute">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_attribute</methodname>
+     <type>domattribute</type><methodname>DomDocument->create_attribute</methodname>
      <methodparam><type>string</type><parameter>name</parameter></methodparam>
      <methodparam><type>string</type><parameter>value</parameter></methodparam>
     </methodsynopsis>
diff --git a/reference/domxml/functions/DomDocument-create-cdata-section.xml b/reference/domxml/functions/DomDocument-create-cdata-section.xml
index 8e744b5606..a38f71cf3e 100644
--- a/reference/domxml/functions/DomDocument-create-cdata-section.xml
+++ b/reference/domxml/functions/DomDocument-create-cdata-section.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-cdata-section">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_cdata_section</methodname>
+     <type>domcdata</type><methodname>DomDocument->create_cdata_section</methodname>
      <methodparam><type>string</type><parameter>content</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-create-comment.xml b/reference/domxml/functions/DomDocument-create-comment.xml
index f9479571ed..10504c1028 100644
--- a/reference/domxml/functions/DomDocument-create-comment.xml
+++ b/reference/domxml/functions/DomDocument-create-comment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-comment">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_comment</methodname>
+     <type>domcomment</type><methodname>DomDocument->create_comment</methodname>
      <methodparam><type>string</type><parameter>content</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-create-element-ns.xml b/reference/domxml/functions/DomDocument-create-element-ns.xml
index 89f0945be0..ae577c3c6c 100644
--- a/reference/domxml/functions/DomDocument-create-element-ns.xml
+++ b/reference/domxml/functions/DomDocument-create-element-ns.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-element-ns">
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_element_ns</methodname>
+     <type>domelement</type><methodname>DomDocument->create_element_ns</methodname>
      <methodparam><type>string</type><parameter>uri</parameter></methodparam>
      <methodparam><type>string</type><parameter>name</parameter></methodparam>
      <methodparam choice="opt"><type>string</type><parameter>prefix</parameter></methodparam>
diff --git a/reference/domxml/functions/DomDocument-create-element.xml b/reference/domxml/functions/DomDocument-create-element.xml
index f528d02c59..5813c2406a 100644
--- a/reference/domxml/functions/DomDocument-create-element.xml
+++ b/reference/domxml/functions/DomDocument-create-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-element">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_element</methodname>
+     <type>domelement</type><methodname>DomDocument->create_element</methodname>
      <methodparam><type>string</type><parameter>name</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-create-entity-reference.xml b/reference/domxml/functions/DomDocument-create-entity-reference.xml
index d270cf33d3..56e434e024 100644
--- a/reference/domxml/functions/DomDocument-create-entity-reference.xml
+++ b/reference/domxml/functions/DomDocument-create-entity-reference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-entity-reference">
    <refnamediv>
@@ -10,7 +10,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_entity_reference</methodname>
+     <type>domentityreference</type><methodname>DomDocument->create_entity_reference</methodname>
      <methodparam><type>string</type><parameter>content</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-create-processing-instruction.xml b/reference/domxml/functions/DomDocument-create-processing-instruction.xml
index 7e45bf3ab2..fb5dd8d775 100644
--- a/reference/domxml/functions/DomDocument-create-processing-instruction.xml
+++ b/reference/domxml/functions/DomDocument-create-processing-instruction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-processing-instruction">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_processing_instruction</methodname>
+     <type>domprocessinginstruction</type><methodname>DomDocument->create_processing_instruction</methodname>
      <methodparam><type>string</type><parameter>content</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-create-text-node.xml b/reference/domxml/functions/DomDocument-create-text-node.xml
index b31c2b1102..f6a4b3715c 100644
--- a/reference/domxml/functions/DomDocument-create-text-node.xml
+++ b/reference/domxml/functions/DomDocument-create-text-node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-create-text-node">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->create_text_node</methodname>
+     <type>domtext</type><methodname>DomDocument->create_text_node</methodname>
      <methodparam><type>string</type><parameter>content</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-doctype.xml b/reference/domxml/functions/DomDocument-doctype.xml
index 77cc1c3dd7..b4504e3a4b 100644
--- a/reference/domxml/functions/DomDocument-doctype.xml
+++ b/reference/domxml/functions/DomDocument-doctype.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-doctype">
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->doctype</methodname>
+     <type>domdocumenttype</type><methodname>DomDocument->doctype</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-document-element.xml b/reference/domxml/functions/DomDocument-document-element.xml
index 2785978fc7..eecb8f68a1 100644
--- a/reference/domxml/functions/DomDocument-document-element.xml
+++ b/reference/domxml/functions/DomDocument-document-element.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.6 -->
   <refentry id="function.domdocument-document-element">
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->document_element</methodname>
+     <type>domelement</type><methodname>DomDocument->document_element</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomDocument-get-element-by-id.xml b/reference/domxml/functions/DomDocument-get-element-by-id.xml
index 77f38f155f..a299ab6d4e 100644
--- a/reference/domxml/functions/DomDocument-get-element-by-id.xml
+++ b/reference/domxml/functions/DomDocument-get-element-by-id.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.domdocument-get-element-by-id">
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomDocument->get_element_by_id</methodname>
+     <type>domelement</type><methodname>DomDocument->get_element_by_id</methodname>
      <methodparam><type>string</type><parameter>id</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomElement-get-attribute-node.xml b/reference/domxml/functions/DomElement-get-attribute-node.xml
index fcd3f6f1cc..3c1ba1d422 100644
--- a/reference/domxml/functions/DomElement-get-attribute-node.xml
+++ b/reference/domxml/functions/DomElement-get-attribute-node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.27 -->
   <refentry id='function.domelement-get-attribute-node'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomElement->get_attribute_node</methodname>
+     <type>domattribute</type><methodname>DomElement->get_attribute_node</methodname>
      <methodparam><type>string</type><parameter>name</parameter></methodparam>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomElement-set-attribute-node.xml b/reference/domxml/functions/DomElement-set-attribute-node.xml
index 3cd5c757c1..2f70d7ca38 100644
--- a/reference/domxml/functions/DomElement-set-attribute-node.xml
+++ b/reference/domxml/functions/DomElement-set-attribute-node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
 <!-- This function is not implemented at all for the time being
   <refentry id='function.domelement-set-attribute-node'>
@@ -12,8 +12,8 @@
    <refsect1>
     <title>Description</title>
     <methodsynopsis>
-     <type>bool</type><methodname>DomElement->set_attribute_node</methodname>
-     <methodparam><type>object</type><parameter>attr</parameter></methodparam>
+     <type>domnode</type><methodname>DomElement->set_attribute_node</methodname>
+     <methodparam><type>domnode</type><parameter>attr</parameter></methodparam>
     </methodsynopsis>
     <para>
      &warn.undocumented.func;
diff --git a/reference/domxml/functions/DomElement-set-attribute.xml b/reference/domxml/functions/DomElement-set-attribute.xml
index da3c539743..8685358990 100644
--- a/reference/domxml/functions/DomElement-set-attribute.xml
+++ b/reference/domxml/functions/DomElement-set-attribute.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.27 -->
   <refentry id='function.domelement-set-attribute'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomElement->set_attribute</methodname>
+     <type>domattribute</type><methodname>DomElement->set_attribute</methodname>
      <methodparam><type>string</type><parameter>name</parameter></methodparam>
      <methodparam><type>string</type><parameter>value</parameter></methodparam>
     </methodsynopsis>
diff --git a/reference/domxml/functions/DomNode-append-child.xml b/reference/domxml/functions/DomNode-append-child.xml
index 7990339af7..3fd8f7878b 100644
--- a/reference/domxml/functions/DomNode-append-child.xml
+++ b/reference/domxml/functions/DomNode-append-child.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.40 -->
   <refentry id='function.domnode-append-child'>
    <refnamediv>
@@ -11,8 +11,8 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->append_child</methodname>
-     <methodparam><type>object</type><parameter>newnode</parameter></methodparam>
+     <type>domelement</type><methodname>DomNode->append_child</methodname>
+     <methodparam><type>domelement</type><parameter>newnode</parameter></methodparam>
     </methodsynopsis>
     <para>
      This functions appends a child to an existing list of children or creates
diff --git a/reference/domxml/functions/DomNode-append-sibling.xml b/reference/domxml/functions/DomNode-append-sibling.xml
index 612449ac8d..130dfe2109 100644
--- a/reference/domxml/functions/DomNode-append-sibling.xml
+++ b/reference/domxml/functions/DomNode-append-sibling.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id='function.domnode-append-sibling'>
    <refnamediv>
     <refname>DomNode->append_sibling</refname>
@@ -10,8 +10,8 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->append_sibling</methodname>
-     <methodparam><type>object</type><parameter>newnode</parameter></methodparam>
+     <type>domelement</type><methodname>DomNode->append_sibling</methodname>
+     <methodparam><type>domelement</type><parameter>newnode</parameter></methodparam>
     </methodsynopsis>
     <para>
      This functions appends a sibling to an existing node.
diff --git a/reference/domxml/functions/DomNode-clone-node.xml b/reference/domxml/functions/DomNode-clone-node.xml
index b7d20276c0..dad9d18a7b 100644
--- a/reference/domxml/functions/DomNode-clone-node.xml
+++ b/reference/domxml/functions/DomNode-clone-node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.39 -->
   <refentry id='function.domnode-clone-node'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->clone_node</methodname>
+     <type>domelement</type><methodname>DomNode->clone_node</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomNode-first-child.xml b/reference/domxml/functions/DomNode-first-child.xml
index c4001338c5..8139915e65 100644
--- a/reference/domxml/functions/DomNode-first-child.xml
+++ b/reference/domxml/functions/DomNode-first-child.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-first-child'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->first_child</methodname>
+     <type>domelement</type><methodname>DomNode->first_child</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomNode-insert-before.xml b/reference/domxml/functions/DomNode-insert-before.xml
index 74f9c68092..82902348d6 100644
--- a/reference/domxml/functions/DomNode-insert-before.xml
+++ b/reference/domxml/functions/DomNode-insert-before.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-insert-before'>
    <refnamediv>
@@ -11,9 +11,9 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->insert_before</methodname>
-     <methodparam><type>object</type><parameter>newnode</parameter></methodparam>
-     <methodparam><type>object</type><parameter>refnode</parameter></methodparam>
+     <type>domelement</type><methodname>DomNode->insert_before</methodname>
+     <methodparam><type>domelement</type><parameter>newnode</parameter></methodparam>
+     <methodparam><type>domelement</type><parameter>refnode</parameter></methodparam>
     </methodsynopsis>
     <para>
      This function inserts the new node <parameter>newnode</parameter> right
diff --git a/reference/domxml/functions/DomNode-last-child.xml b/reference/domxml/functions/DomNode-last-child.xml
index ddd43e33f6..96deb49dfa 100644
--- a/reference/domxml/functions/DomNode-last-child.xml
+++ b/reference/domxml/functions/DomNode-last-child.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-last-child'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->last_child</methodname>
+     <type>domelement</type><methodname>DomNode->last_child</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomNode-next-sibling.xml b/reference/domxml/functions/DomNode-next-sibling.xml
index 89434a67e3..3b4d806a41 100644
--- a/reference/domxml/functions/DomNode-next-sibling.xml
+++ b/reference/domxml/functions/DomNode-next-sibling.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-next-sibling'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->next_sibling</methodname>
+     <type>domelement</type><methodname>DomNode->next_sibling</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomNode-owner-document.xml b/reference/domxml/functions/DomNode-owner-document.xml
index 37d18d4d75..820cc313a9 100644
--- a/reference/domxml/functions/DomNode-owner-document.xml
+++ b/reference/domxml/functions/DomNode-owner-document.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-owner-document'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->owner_document</methodname>
+     <type>domdocument</type><methodname>DomNode->owner_document</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomNode-parent-node.xml b/reference/domxml/functions/DomNode-parent-node.xml
index 903d1a279e..7801653180 100644
--- a/reference/domxml/functions/DomNode-parent-node.xml
+++ b/reference/domxml/functions/DomNode-parent-node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-parent-node'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->parent_node</methodname>
+     <type>domnode</type><methodname>DomNode->parent_node</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomNode-previous-sibling.xml b/reference/domxml/functions/DomNode-previous-sibling.xml
index 3681704747..e6a17ffa2a 100644
--- a/reference/domxml/functions/DomNode-previous-sibling.xml
+++ b/reference/domxml/functions/DomNode-previous-sibling.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-previous-sibling'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->previous_sibling</methodname>
+     <type>domelement</type><methodname>DomNode->previous_sibling</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomNode-remove-child.xml b/reference/domxml/functions/DomNode-remove-child.xml
index 7a1869fd15..d7089a8994 100644
--- a/reference/domxml/functions/DomNode-remove-child.xml
+++ b/reference/domxml/functions/DomNode-remove-child.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id='function.domnode-remove-child'>
    <refnamediv>
@@ -11,8 +11,8 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->remove_child</methodname>
-     <methodparam><type>object</type><parameter>oldchild</parameter></methodparam>
+     <type>domtext</type><methodname>DomNode->remove_child</methodname>
+     <methodparam><type>domtext</type><parameter>oldchild</parameter></methodparam>
     </methodsynopsis>
     <para>
      This functions removes a child from a list of children. If child cannot
diff --git a/reference/domxml/functions/DomNode-replace-child.xml b/reference/domxml/functions/DomNode-replace-child.xml
index af405faefb..e9557a18f3 100644
--- a/reference/domxml/functions/DomNode-replace-child.xml
+++ b/reference/domxml/functions/DomNode-replace-child.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
   <refentry id='function.domnode-replace-child'>
    <refnamediv>
     <refname>DomNode->replace_child</refname>
@@ -10,9 +10,9 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->replace_child</methodname>
-     <methodparam><type>object</type><parameter>oldnode</parameter></methodparam>
-     <methodparam><type>object</type><parameter>newnode</parameter></methodparam>
+     <type>domelement</type><methodname>DomNode->replace_child</methodname>
+     <methodparam><type>domelement</type><parameter>oldnode</parameter></methodparam>
+     <methodparam><type>domelement</type><parameter>newnode</parameter></methodparam>
     </methodsynopsis>
     <para>
      (PHP 4.2) This function replaces the child <parameter>oldnode</parameter>
diff --git a/reference/domxml/functions/DomNode-replace-node.xml b/reference/domxml/functions/DomNode-replace-node.xml
index 8d1f0b6420..c7f29f41b7 100644
--- a/reference/domxml/functions/DomNode-replace-node.xml
+++ b/reference/domxml/functions/DomNode-replace-node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.39 -->
   <refentry id='function.domnode-replace-node'>
    <refnamediv>
@@ -11,8 +11,8 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->replace_node</methodname>
-     <methodparam><type>object</type><parameter>newnode</parameter></methodparam>
+     <type>domelement</type><methodname>DomNode->replace_node</methodname>
+     <methodparam><type>domelement</type><parameter>newnode</parameter></methodparam>
     </methodsynopsis>
     <para>
      (PHP 4.2) This function replaces an existing node with the passed
diff --git a/reference/domxml/functions/DomNode-unlink-node.xml b/reference/domxml/functions/DomNode-unlink-node.xml
index 6fb9179c1b..1b2bc9358f 100644
--- a/reference/domxml/functions/DomNode-unlink-node.xml
+++ b/reference/domxml/functions/DomNode-unlink-node.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.39 -->
   <refentry id='function.domnode-unlink-node'>
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>DomNode->unlink_node</methodname>
+     <type>void</type><methodname>DomNode->unlink_node</methodname>
      <void/>
     </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/DomXsltStylesheet-process.xml b/reference/domxml/functions/DomXsltStylesheet-process.xml
index 8370f29192..be697256ed 100644
--- a/reference/domxml/functions/DomXsltStylesheet-process.xml
+++ b/reference/domxml/functions/DomXsltStylesheet-process.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.domxsltstylesheet-process">
    <refnamediv>
     <refname>DomXsltStylesheet->process</refname>
@@ -10,8 +10,8 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>DomXsltStylesheet->process</methodname>
-      <methodparam><type>object</type><parameter>DomDocument</parameter></methodparam>
+      <type>domdocument</type><methodname>DomXsltStylesheet->process</methodname>
+      <methodparam><type>domdocument</type><parameter>DomDocument</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>xslt_parameters</parameter></methodparam>
       <methodparam choice="opt"><type>bool</type><parameter>param_is_xpath</parameter></methodparam>
 
diff --git a/reference/domxml/functions/DomXsltStylesheet-result-dump-file.xml b/reference/domxml/functions/DomXsltStylesheet-result-dump-file.xml
index b7325b1479..c3046b4efc 100644
--- a/reference/domxml/functions/DomXsltStylesheet-result-dump-file.xml
+++ b/reference/domxml/functions/DomXsltStylesheet-result-dump-file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
   <refentry id="function.domxsltstylesheet-result-dump-file">
    <refnamediv>
     <refname>DomXsltStylesheet->result_dump_file</refname>
@@ -11,7 +11,7 @@
     &reftitle.description;
      <methodsynopsis>
       <type>string</type><methodname>DomXsltStylesheet->result_dump_file</methodname>
-      <methodparam><type>object</type><parameter>DomDocument</parameter></methodparam>
+      <methodparam><type>domdocument</type><parameter>DomDocument</parameter></methodparam>
       <methodparam><type>string</type><parameter>filename</parameter></methodparam>
 
      </methodsynopsis>
diff --git a/reference/domxml/functions/DomXsltStylesheet-result-dump-mem.xml b/reference/domxml/functions/DomXsltStylesheet-result-dump-mem.xml
index 42b0efd9ac..ae682972f5 100644
--- a/reference/domxml/functions/DomXsltStylesheet-result-dump-mem.xml
+++ b/reference/domxml/functions/DomXsltStylesheet-result-dump-mem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.domxsltstylesheet-result-dump-mem">
    <refnamediv>
     <refname>DomXsltStylesheet->result_dump_mem</refname>
@@ -11,7 +11,7 @@
     &reftitle.description;
      <methodsynopsis>
       <type>string</type><methodname>DomXsltStylesheet->result_dump_mem</methodname>
-      <methodparam><type>object</type><parameter>DomDocument</parameter></methodparam>
+      <methodparam><type>domdocument</type><parameter>DomDocument</parameter></methodparam>
 
      </methodsynopsis>
     &warn.experimental.func;
diff --git a/reference/domxml/functions/domxml-new-doc.xml b/reference/domxml/functions/domxml-new-doc.xml
index 47286c3e2a..879e3703e9 100644
--- a/reference/domxml/functions/domxml-new-doc.xml
+++ b/reference/domxml/functions/domxml-new-doc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.39 -->
   <refentry id="function.domxml-new-doc">
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>domxml_new_doc</methodname>
+      <type>domdocument</type><methodname>domxml_new_doc</methodname>
       <methodparam><type>string</type><parameter>version</parameter></methodparam>
      </methodsynopsis>
     &warn.experimental.func;
diff --git a/reference/domxml/functions/domxml-open-file.xml b/reference/domxml/functions/domxml-open-file.xml
index ad9d08c3ea..00762fb054 100644
--- a/reference/domxml/functions/domxml-open-file.xml
+++ b/reference/domxml/functions/domxml-open-file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.1 -->
   <refentry id="function.domxml-open-file">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>domxml_open_file</methodname>
+     <type>domdocument</type><methodname>domxml_open_file</methodname>
      <methodparam><type>string</type><parameter>filename</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      <methodparam choice="opt"><type>array</type><parameter role="reference">error</parameter></methodparam>
diff --git a/reference/domxml/functions/domxml-open-mem.xml b/reference/domxml/functions/domxml-open-mem.xml
index a95c3de674..34bdab9061 100644
--- a/reference/domxml/functions/domxml-open-mem.xml
+++ b/reference/domxml/functions/domxml-open-mem.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.1 -->
   <refentry id="function.domxml-open-mem">
    <refnamediv>
@@ -9,7 +9,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>domxml_open_mem</methodname>
+     <type>domdocument</type><methodname>domxml_open_mem</methodname>
      <methodparam><type>string</type><parameter>str</parameter></methodparam>
      <methodparam choice="opt"><type>int</type><parameter>mode</parameter></methodparam>
      <methodparam choice="opt"><type>array</type><parameter role="reference">error</parameter></methodparam>
diff --git a/reference/domxml/functions/domxml-xmltree.xml b/reference/domxml/functions/domxml-xmltree.xml
index a258159c19..94e9723986 100644
--- a/reference/domxml/functions/domxml-xmltree.xml
+++ b/reference/domxml/functions/domxml-xmltree.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.1 -->
   <refentry id="function.domxml-xmltree">
    <refnamediv>
@@ -11,7 +11,7 @@
    <refsect1>
     &reftitle.description;
     <methodsynopsis>
-     <type>object</type><methodname>domxml_xmltree</methodname>
+     <type>domdocument</type><methodname>domxml_xmltree</methodname>
      <methodparam><type>string</type><parameter>str</parameter></methodparam>
     </methodsynopsis>
     &warn.experimental.func;
diff --git a/reference/domxml/functions/domxml-xslt-stylesheet-doc.xml b/reference/domxml/functions/domxml-xslt-stylesheet-doc.xml
index 5931fef933..c1d3f0f16c 100644
--- a/reference/domxml/functions/domxml-xslt-stylesheet-doc.xml
+++ b/reference/domxml/functions/domxml-xslt-stylesheet-doc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
   <refentry id="function.domxml-xslt-stylesheet-doc">
    <refnamediv>
     <refname>domxml_xslt_stylesheet_doc</refname>
@@ -10,8 +10,8 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>domxml_xslt_stylesheet_doc</methodname>
-      <methodparam><type>object</type><parameter>DocDocument Object</parameter></methodparam>
+      <type>XsltStylesheet</type><methodname>domxml_xslt_stylesheet_doc</methodname>
+      <methodparam><type>domdocument</type><parameter>DocDocumentObject</parameter></methodparam>
      </methodsynopsis>
     &warn.experimental.func;
     &warn.undocumented.func;
diff --git a/reference/domxml/functions/domxml-xslt-stylesheet-file.xml b/reference/domxml/functions/domxml-xslt-stylesheet-file.xml
index 62d23e6bf2..3977d46cd9 100644
--- a/reference/domxml/functions/domxml-xslt-stylesheet-file.xml
+++ b/reference/domxml/functions/domxml-xslt-stylesheet-file.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.domxml-xslt-stylesheet-file">
    <refnamediv>
     <refname>domxml_xslt_stylesheet_file</refname>
@@ -10,8 +10,8 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>domxml_xslt_stylesheet_file</methodname>
-      <methodparam><type>string</type><parameter>xsl file</parameter></methodparam>
+      <type>XsltStylesheet</type><methodname>domxml_xslt_stylesheet_file</methodname>
+      <methodparam><type>string</type><parameter>xsl_file</parameter></methodparam>
      </methodsynopsis>
     &warn.experimental.func;
     &warn.undocumented.func;
diff --git a/reference/domxml/functions/domxml-xslt-stylesheet.xml b/reference/domxml/functions/domxml-xslt-stylesheet.xml
index 82288ec2f4..f64bd85e46 100644
--- a/reference/domxml/functions/domxml-xslt-stylesheet.xml
+++ b/reference/domxml/functions/domxml-xslt-stylesheet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
   <refentry id="function.domxml-xslt-stylesheet">
    <refnamediv>
     <refname>domxml_xslt_stylesheet</refname>
@@ -10,8 +10,8 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>domxml_xslt_stylesheet</methodname>
-      <methodparam><type>string</type><parameter>xsl document</parameter></methodparam>
+      <type>XsltStylesheet</type><methodname>domxml_xslt_stylesheet</methodname>
+      <methodparam><type>string</type><parameter>xsl_document</parameter></methodparam>
      </methodsynopsis>
     &warn.experimental.func;
     &warn.undocumented.func;
diff --git a/reference/domxml/functions/xpath-eval-expression.xml b/reference/domxml/functions/xpath-eval-expression.xml
index 1c7a2814d0..b8c2674440 100644
--- a/reference/domxml/functions/xpath-eval-expression.xml
+++ b/reference/domxml/functions/xpath-eval-expression.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.29 -->
   <refentry id="function.xpath-eval-expression">
    <refnamediv>
@@ -11,8 +11,8 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>xpath_eval_expression</methodname>
-      <methodparam><type>object</type><parameter>xpath_context</parameter></methodparam>
+      <type>XPathObject</type><methodname>xpath_eval_expression</methodname>
+      <methodparam><type>XPathContext</type><parameter>xpath_context</parameter></methodparam>
       <methodparam><type>string</type><parameter>expression</parameter></methodparam>
      </methodsynopsis>
      &warn.experimental.func;
diff --git a/reference/domxml/functions/xpath-eval.xml b/reference/domxml/functions/xpath-eval.xml
index 10e6614fe1..72da44a410 100644
--- a/reference/domxml/functions/xpath-eval.xml
+++ b/reference/domxml/functions/xpath-eval.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.xpath-eval">
    <refnamediv>
@@ -12,9 +12,9 @@
     &reftitle.description;
      <methodsynopsis>
       <type>array</type><methodname>xpath_eval</methodname>
-      <methodparam><type>object</type><parameter>xpath context</parameter></methodparam>
-      <methodparam><type>string</type><parameter>xpath expression</parameter></methodparam>
-      <methodparam choice="opt"><type>object</type><parameter>contextnode</parameter></methodparam>      
+      <methodparam><type>XPathContext</type><parameter>xpath_context</parameter></methodparam>
+      <methodparam><type>string</type><parameter>xpath_expression</parameter></methodparam>
+      <methodparam choice="opt"><type>domnode</type><parameter>contextnode</parameter></methodparam>      
      </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/domxml/functions/xpath-new-context.xml b/reference/domxml/functions/xpath-new-context.xml
index 5f7f41e025..4b7ef17429 100644
--- a/reference/domxml/functions/xpath-new-context.xml
+++ b/reference/domxml/functions/xpath-new-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.38 -->
   <refentry id="function.xpath-new-context">
    <refnamediv>
@@ -11,8 +11,8 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>object</type><methodname>xpath_new_context</methodname>
-      <methodparam><type>object</type><parameter>dom document</parameter></methodparam>
+      <type>XPathContext</type><methodname>xpath_new_context</methodname>
+      <methodparam><type>domdocument</type><parameter>dom_document</parameter></methodparam>
      </methodsynopsis>
     &warn.experimental.func;
     <para>
diff --git a/reference/domxml/functions/xptr-eval.xml b/reference/domxml/functions/xptr-eval.xml
index a22478ee3c..9772878311 100644
--- a/reference/domxml/functions/xptr-eval.xml
+++ b/reference/domxml/functions/xptr-eval.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.6 -->
   <refentry id='function.xptr-eval'>
    <refnamediv>
@@ -12,7 +12,7 @@
     &reftitle.description;
      <methodsynopsis>
       <type>int</type><methodname>xptr_eval</methodname>
-      <methodparam choice="opt"><type>object</type><parameter>xpath_context</parameter></methodparam>
+      <methodparam choice="opt"><type>XPathContext</type><parameter>xpath_context</parameter></methodparam>
       <methodparam><type>string</type><parameter>eval_str</parameter></methodparam>
      </methodsynopsis>
     <para>
diff --git a/reference/domxml/functions/xptr-new-context.xml b/reference/domxml/functions/xptr-new-context.xml
index 50e471c02a..983a64d57b 100644
--- a/reference/domxml/functions/xptr-new-context.xml
+++ b/reference/domxml/functions/xptr-new-context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/domxml.xml, last change in rev 1.29 -->
   <refentry id='function.xptr-new-context'>
    <refnamediv>
@@ -11,8 +11,8 @@
    <refsect1>
     &reftitle.description;
      <methodsynopsis>
-      <type>string</type><methodname>xptr_new_context</methodname>
-      <methodparam choice="opt"><type>object</type><parameter>doc_handle</parameter></methodparam>
+      <type>XPathContext</type><methodname>xptr_new_context</methodname>
+      <void/>
      </methodsynopsis>
     <para>
      &warn.undocumented.func;