diff --git a/reference/intl/locale.xml b/reference/intl/locale.xml
index 11c2423f58..4591a6380a 100644
--- a/reference/intl/locale.xml
+++ b/reference/intl/locale.xml
@@ -73,7 +73,7 @@
      <varname linkend="locale.props.name">name</varname>
      </fieldsynopsis>
      
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.Locale')/db:refentry/db:refsect1[@role='description']/descendant::db:fieldsynopsis[1])" />
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.locale')/db:refentry/db:refsect1[@role='description']/descendant::db:fieldsynopsis[1])" />
     -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
diff --git a/reference/intl/numberformatter.xml b/reference/intl/numberformatter.xml
index 9d16df0b71..10bbd1f33d 100644
--- a/reference/intl/numberformatter.xml
+++ b/reference/intl/numberformatter.xml
@@ -73,7 +73,7 @@
      <varname linkend="NumberFormatter.props.name">name</varname>
      </fieldsynopsis>
      
-     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.NumberFormatter')/db:refentry/db:refsect1[@role='description']/descendant::db:fieldsynopsis[1])" />
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.numberformatter')/db:refentry/db:refsect1[@role='description']/descendant::db:fieldsynopsis[1])" />
     -->
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
diff --git a/reference/phar/book.xml b/reference/phar/book.xml
index e61dce0882..2638bf4e55 100644
--- a/reference/phar/book.xml
+++ b/reference/phar/book.xml
@@ -161,10 +161,10 @@
  &reference.phar.using;
  &reference.phar.creating;
  &reference.phar.fileformat;
- &reference.phar.Phar;
- &reference.phar.PharData;
- &reference.phar.PharFileInfo;
- &reference.phar.PharException;
+ &reference.phar.phar;
+ &reference.phar.phardata;
+ &reference.phar.pharfileinfo;
+ &reference.phar.pharexception;
 
 </book>
 
diff --git a/reference/phar/Phar.xml b/reference/phar/phar.xml
similarity index 91%
rename from reference/phar/Phar.xml
rename to reference/phar/phar.xml
index dc17f3007b..1b0a3be3eb 100644
--- a/reference/phar/Phar.xml
+++ b/reference/phar/phar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<phpdoc:classref xml:id="class.Phar" xmlns="http://docbook.org/ns/docbook"
+<phpdoc:classref xml:id="class.phar" xmlns="http://docbook.org/ns/docbook"
  xmlns:xlink="http://www.w3.org/1999/xlink"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:phpdoc="http://php.net/ns/phpdoc">
@@ -50,10 +50,10 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
  
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.Phar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
  
 <!--    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.RecursiveDirectoryIterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.recursivedirectoryiterator')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 -->
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/phar/PharData.xml b/reference/phar/phardata.xml
similarity index 92%
rename from reference/phar/PharData.xml
rename to reference/phar/phardata.xml
index d7f293d791..733ac298f7 100644
--- a/reference/phar/PharData.xml
+++ b/reference/phar/phardata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.PharData" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.phardata" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The PharData class</title>
  <titleabbrev>PharData</titleabbrev>
  
@@ -44,10 +44,10 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
  
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.PharData')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phardata')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
  
     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.Phar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.phar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/phar/PharException.xml b/reference/phar/pharexception.xml
similarity index 94%
rename from reference/phar/PharException.xml
rename to reference/phar/pharexception.xml
index 6d6970746a..f19e4c3a45 100644
--- a/reference/phar/PharException.xml
+++ b/reference/phar/pharexception.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<phpdoc:exceptionref xml:id="class.PharException" xmlns="http://docbook.org/ns/docbook"
+<phpdoc:exceptionref xml:id="class.pharexception" xmlns="http://docbook.org/ns/docbook"
  xmlns:xlink="http://www.w3.org/1999/xlink"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xmlns:phpdoc="http://php.net/ns/phpdoc">
@@ -44,7 +44,7 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
  
 <!--    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.Exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 -->
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/phar/PharFileInfo.xml b/reference/phar/pharfileinfo.xml
similarity index 91%
rename from reference/phar/PharFileInfo.xml
rename to reference/phar/pharfileinfo.xml
index 49b23685ff..693197b657 100644
--- a/reference/phar/PharFileInfo.xml
+++ b/reference/phar/pharfileinfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 
-<phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.PharFileInfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.pharfileinfo" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The PharFileInfo class</title>
  <titleabbrev>PharFileInfo</titleabbrev>
  
@@ -41,10 +41,10 @@
     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
  
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.PharFileInfo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.pharfileinfo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
  
 <!--    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.SplFileInfo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.splfileinfo')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[1])" />
 -->
    </classsynopsis>
 <!-- }}} -->
diff --git a/reference/sam/reference.xml b/reference/sam/reference.xml
index 5ae26e96bf..16f119506a 100644
--- a/reference/sam/reference.xml
+++ b/reference/sam/reference.xml
@@ -11,13 +11,13 @@
     &reftitle.classes;
 
 <!-- Connection class  -->
-    <section xml:id="sam.class.Connection">
+    <section xml:id="class.samconnection">
      <title><classname>SAMConnection</classname></title>
      <para>
       Object representing a connection to a Messaging Server
      </para>
 
-     <section xml:id="sam.class.Connection.constructor">
+     <section>
       &reftitle.constructor;
       <itemizedlist>
        <listitem>
@@ -26,9 +26,9 @@
         </para>
        </listitem>
       </itemizedlist>
-     </section>  <!-- xml:id=sam.class.Connection.constructor -->
+     </section>
 
-     <section xml:id="sam.class.Connection.methods">
+     <section>
       &reftitle.methods;
       <itemizedlist>
        <listitem>
@@ -114,9 +114,9 @@
         </para>
        </listitem>
       </itemizedlist>
-     </section>  <!-- xml:id=sam.class.Connection.methods -->
+     </section>
 
-     <section xml:id="sam.class.Connection.properties">
+     <section>
       &reftitle.properties;
       <itemizedlist>
        <listitem>
@@ -134,17 +134,17 @@
         </para>
        </listitem>
       </itemizedlist>
-     </section>    <!-- xml:id=sam.class.Connection.properties -->
-    </section>   <!-- xml:id=sam.class.Connection -->
+     </section>
+    </section>   <!-- xml:id=class.samconnection -->
 
 <!-- Message class    *************************************************** -->
-    <section xml:id="sam.class.Message">
+    <section xml:id="class.sammessage">
      <title><classname>SAMMessage</classname></title>
      <para>
       Object representing a message to be sent or received
      </para>
 
-     <section xml:id="sam.class.Message.constructor">
+     <section>
       &reftitle.constructor;
       <itemizedlist>
        <listitem>
@@ -154,9 +154,9 @@
         </para>
        </listitem>
       </itemizedlist>
-     </section>  <!-- xml:id=sam.class.Message.constructor -->
+     </section>
 
-     <section xml:id="sam.class.Message.properties">
+     <section>
       &reftitle.properties;
       <itemizedlist>
        <listitem>
@@ -172,8 +172,8 @@
         </para>
        </listitem>
       </itemizedlist>
-     </section>  <!-- xml:id=sam.class.Message.methods -->
-    </section>   <!-- xml:id=sam.class.Message -->
+     </section>
+    </section>   <!-- xml:id=class.sammessage -->
 
    </section>    <!-- xml:id=sam.classes -->
 
diff --git a/reference/sca/reference.xml b/reference/sca/reference.xml
index 35492dd3a8..46e64a7d4b 100644
--- a/reference/sca/reference.xml
+++ b/reference/sca/reference.xml
@@ -17,7 +17,7 @@
     and <classname>SCA_SoapProxy</classname>.
    </para>
    
-   <section xml:id="sca.class"><!-- {{{ -->
+   <section xml:id="class.sca"><!-- {{{ -->
     <title><classname>SCA</classname></title>
     <para>
      Much of the work of the SCA class is performed when the file
@@ -40,7 +40,7 @@
      SDO's XML Data Access Service. 
     </para>
     
-    <section xml:id="sca.class.SCA.methods"><!-- {{{ -->
+    <section><!-- {{{ -->
      &reftitle.methods;
      <itemizedlist>
       <listitem>
@@ -59,7 +59,7 @@
     </section> <!-- }}} -->
    </section><!-- }}} -->
    
-   <section xml:id="sca-local-proxy.class"><!-- {{{ -->
+   <section xml:id="class.sca-localproxy"><!-- {{{ -->
     <title>
      <classname>SCA_LocalProxy</classname>
     </title>
@@ -82,7 +82,7 @@
      Service. 
     </para>
     
-    <section xml:id="sca.class.SCA-LocalProxy.methods"><!-- {{{ -->
+    <section><!-- {{{ -->
      &reftitle.methods;
      <itemizedlist>
       <listitem>
@@ -96,7 +96,7 @@
     </section><!-- }}} -->
    </section><!-- }}} -->
    
-   <section xml:id="sca-soap-proxy.class"><!-- {{{ -->
+   <section xml:id="class.sca-soapproxy"><!-- {{{ -->
     <title>
      <classname>SCA_SoapProxy</classname>
     </title>
@@ -120,7 +120,7 @@
      as those to SDO's XML Data Access Service. 
     </para>
     
-    <section xml:id="sca.class.SCA-SoapProxy.methods"><!-- {{{ -->
+    <section><!-- {{{ -->
      &reftitle.methods;
      <itemizedlist>
       <listitem>
diff --git a/reference/sdo/reference.xml b/reference/sdo/reference.xml
index 398a87afdf..f7d9622b97 100644
--- a/reference/sdo/reference.xml
+++ b/reference/sdo/reference.xml
@@ -62,7 +62,7 @@
    <section xml:id="sdo.class.sdo-apis">
     <title>SDO Application Programmer Interface</title>
 
-    <section xml:id="sdo.class.sdo-dataobject">
+    <section xml:id="class.sdo-dataobject">
      <title>
       <classname>SDO_DataObject</classname>
      </title>
@@ -73,7 +73,7 @@
       <function>__set</function> methods for property access overloading),
       Iterator, and Countable interfaces.
      </para>
-     <section xml:id="sdo.class.SDO-DataObject.methods"> &reftitle.methods;
+     <section> &reftitle.methods;
       <itemizedlist>
        <listitem>
         <para>
@@ -115,7 +115,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdo-sequence">
+    <section xml:id="class.sdo-sequence">
      <title>
       <classname>SDO_Sequence</classname>
      </title>
@@ -128,7 +128,7 @@
       down. In addition to the methods below, SDO_Sequence extends the
       ArrayAccess, Iterator and Countable interface.
      </para>
-     <section xml:id="sdo.class.SDO-Sequence.methods">
+     <section>
       &reftitle.methods;
       <itemizedlist>
        <listitem>
@@ -153,7 +153,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdo-list">
+    <section xml:id="class.sdo-list">
      <title>
       <classname>SDO_List</classname>
      </title>
@@ -164,7 +164,7 @@
       therefore inserting or removing elements may shift other elements
       up or down.
      </para>
-     <section xml:id="sdo.class.SDO-List.methods">
+     <section>
       &reftitle.methods;
       <itemizedlist>
        <listitem>
@@ -177,7 +177,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdo-datafactory">
+    <section xml:id="class.sdo-datafactory">
      <title>
       <classname>SDO_DataFactory</classname>
      </title>
@@ -189,7 +189,7 @@
       for the factory and can then optionally return an instance of, 
       or implement, the SDO_DataFactory interface.
      </para>
-     <section xml:id="sdo.class.SDO-DataFactory.methods">
+     <section>
       &reftitle.methods;
       <itemizedlist>
        <listitem>
@@ -202,7 +202,7 @@
      </section>
     </section>
         
-    <section xml:id="sdo.class.sdo-exception">
+    <section xml:id="class.sdo-exception">
      <title>
       <classname>SDO_Exception</classname>
      </title>
@@ -245,7 +245,7 @@
        </listitem>
       </itemizedlist>
      </para>
-     <section xml:id="sdo.class.SDO-Exception.methods"> &reftitle.methods;
+     <section> &reftitle.methods;
      <para>One method is added to those inherited from the built in 
      <link linkend="language.exceptions.extending">Exception</link> class:
      </para>
@@ -268,7 +268,7 @@
    <section xml:id="sdo.class.sdo-model-apis">
     <title>SDO Reflection Application Programmer Interfaces</title>
 
-    <section xml:id="sdo.class.sdo-reflectiondataobject">
+    <section xml:id="class.sdo-model-reflectiondataobject">
      <title>
       <classname>SDO_Model_ReflectionDataObject</classname>
      </title>
@@ -277,7 +277,7 @@
       to obtain its model type and property information.  
       It is designed to follow the reflection pattern introduced in PHP 5.
      </para>
-     <section xml:id="sdo.class.SDO-Model-ReflectionDataObject.constructor"> 
+     <section>
        &reftitle.constructor;     
        <itemizedlist>
        <listitem>
@@ -288,7 +288,7 @@
        </listitem>     
       </itemizedlist>
      </section>
-     <section xml:id="sdo.class.SDO-Model-ReflectionDataObject.methods"> 
+     <section>
        &reftitle.methods;
       <itemizedlist>
        <listitem>
@@ -321,7 +321,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdo-type">
+    <section xml:id="class.sdo-model-type">
      <title>
       <classname>SDO_Model_Type</classname>
      </title>
@@ -331,7 +331,7 @@
       namespace URI of the type, whether the type allow open content, and so 
       on.
      </para>
-     <section xml:id="sdo.class.SDO-Model-Type.methods"> &reftitle.methods;
+     <section> &reftitle.methods;
       <itemizedlist>
        <listitem>
         <para>
@@ -397,7 +397,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdo-property">
+    <section xml:id="class.sdo-model-property">
      <title>
       <classname>SDO_Model_Property</classname>
      </title>
@@ -408,7 +408,7 @@
       property is contained or reference by its parent, its cardinality, 
       and so on.
      </para>
-     <section xml:id="sdo.class.SDO-Model-Property.methods"> &reftitle.methods;
+     <section> &reftitle.methods;
       <itemizedlist>
         <listitem>
          <para>
@@ -459,18 +459,18 @@
      SDO Data Access Service Developer Interfaces
     </title>
 
-    <section xml:id="sdo.class.sdodas-dataobject">
+    <section xml:id="class.sdo-das-dataobject">
      <title>
       <classname>SDO_DAS_DataObject</classname>
      </title>
      <para>
       The interface through which a Data Access Service can access 
       a data object's 
-      <link linkend="sdo.class.sdodas-changesummary">SDO_DAS_ChangeSummary</link>.
+      <link linkend="class.sdo-das-changesummary">SDO_DAS_ChangeSummary</link>.
       The change summary is used by the Data Access Service to check for 
       conflicts when applying changes back to a data source.
      </para>
-     <section xml:id="sdo.class.SDO-DAS-DataObject.methods"> &reftitle.methods;
+     <section> &reftitle.methods;
       <itemizedlist>
        <listitem>
         <para>
@@ -483,7 +483,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdodas-changesummary">
+    <section xml:id="class.sdo-das-changesummary">
      <title>
       <classname>SDO_DAS_ChangeSummary</classname>
      </title>
@@ -502,7 +502,7 @@
       This is useful when a set of changes have been written out by a
       DAS and the data object is to be reused.
      </para>
-     <section xml:id="sdo.class.SDO-DAS-ChangeSummary.methods">
+     <section>
       &reftitle.methods;
       <itemizedlist>
        <listitem>
@@ -551,7 +551,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdodas-setting">
+    <section xml:id="class.sdo-das-setting">
      <title>
       <classname>SDO_DAS_Setting</classname>
      </title>
@@ -562,7 +562,7 @@
        <function>getOldValues</function>
       </link>.
      </para>
-     <section xml:id="sdo.class.SDO-DAS-Setting.methods">
+     <section>
       &reftitle.methods;
       <itemizedlist>
        <listitem>
@@ -600,7 +600,7 @@
      </section>
     </section>
 
-    <section xml:id="sdo.class.sdodas-datafactory">
+    <section xml:id="class.sdo-das-datafactory">
      <title>
       <classname>SDO_DAS_DataFactory</classname>
      </title>
@@ -614,7 +614,7 @@
       an SDO_DAS_DataFactory model based on a schema for a relational
       database.
      </para>
-     <section xml:id="sdo.class.SDO-DAS-DataFactory.methods">
+     <section>
       &reftitle.methods;
       <itemizedlist>
        <listitem>
diff --git a/reference/sdo/sdo_dataobject/createDataObject.xml b/reference/sdo/sdo_dataobject/createDataObject.xml
index 14b9b0e82c..020e2f4b2e 100644
--- a/reference/sdo/sdo_dataobject/createDataObject.xml
+++ b/reference/sdo/sdo_dataobject/createDataObject.xml
@@ -39,7 +39,7 @@
        Identifies the property for the data object type to be created.
        Can be either a property name (string),
        a property index (int), or an
-       <link linkend="sdo.class.sdo-property">SDO_Model_Property</link>.
+       <link linkend="class.sdo-model-property">SDO_Model_Property</link>.
       </para>
      </listitem>
     </varlistentry>
diff --git a/reference/sdo/sdo_sequence/insert.xml b/reference/sdo/sdo_sequence/insert.xml
index 92aa5f402d..d329e0c499 100644
--- a/reference/sdo/sdo_sequence/insert.xml
+++ b/reference/sdo/sdo_sequence/insert.xml
@@ -59,7 +59,7 @@
      <listitem>
       <para>
        Either a property index, a property name, or an
-       <link linkend="sdo.class.sdo-property">SDO_Model_Property</link>,
+       <link linkend="class.sdo-model-property">SDO_Model_Property</link>,
        used to identify a property in the sequence's 
        corresponding SDO_DataObject.
        A value of NULL signifies unstructured text.
diff --git a/reference/sdo_das_xml/reference.xml b/reference/sdo_das_xml/reference.xml
index a5dee77ae4..07150815a0 100644
--- a/reference/sdo_das_xml/reference.xml
+++ b/reference/sdo_das_xml/reference.xml
@@ -22,7 +22,7 @@
     xml files. 
    </para>
 
-   <section xml:id="sdo-das-xml.class.sdo-das-xml"><!-- {{{ -->
+   <section xml:id="class.sdo-das-xml"><!-- {{{ -->
     <title>
      <classname>SDO_DAS_XML</classname>
     </title>
@@ -32,7 +32,7 @@
      and also used to write the data back.
      Other than the methods to load and save xml files,
     </para>
-    <section xml:id="sdo-das-xml.class.SDO-DAS-XML.methods"><!-- {{{ -->
+    <section><!-- {{{ -->
      &reftitle.methods;
 
      <itemizedlist>
@@ -97,7 +97,7 @@
    </section><!-- }}} -->
 
 
-   <section xml:id="sdo-das-xml.class.sdo-das-xml-document"><!-- {{{ -->
+   <section xml:id="class.sdo-das-xml-document"><!-- {{{ -->
     <title>
      <classname>SDO_DAS_XML_Document</classname>
     </title>
@@ -107,7 +107,7 @@
      Lastly, it can also be used to set the XML version and encoding
      of a document on output.
     </para>
-    <section xml:id="sdo-das-xml.class.SDO-DAS-XML-Document.methods"><!-- {{{ -->
+    <section><!-- {{{ -->
      &reftitle.methods;
      <itemizedlist>
       <listitem>
@@ -154,7 +154,7 @@
     </section><!-- }}} -->
    </section><!-- }}} -->
 
-   <section xml:id="sdo-das-xml.class.sdo-das-xml-parserexception">
+   <section xml:id="class.sdo-das-xml-parserexception">
     <title>
      <classname>SDO_DAS_XML_ParserException</classname>
     </title>
@@ -165,7 +165,7 @@
     </para>
    </section>
 
-   <section xml:id="sdo-das-xml.class.sdo-das-xml-fileexception">
+   <section xml:id="class.sdo-das-xml-fileexception">
     <title>
      <classname>SDO_DAS_XML_FileException</classname>
     </title>