diff --git a/appendices/aliases.xml b/appendices/aliases.xml
index 103cc932cd..4a1b4e4da0 100644
--- a/appendices/aliases.xml
+++ b/appendices/aliases.xml
@@ -333,7 +333,7 @@
      </row>
      <row>
       <entry>ociassignelem</entry>
-      <entry><link linkend="oci-collection.assignelem">OCICollection::assignElem</link></entry>
+      <entry><link linkend="ocicollection.assignelem">OCICollection::assignElem</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
@@ -348,32 +348,32 @@
      </row>
      <row>
       <entry>ocicloselob</entry>
-      <entry><link linkend="oci-lob.close">OCILob::close</link></entry>
+      <entry><link linkend="ocilob.close">OCILob::close</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
       <entry>ocicollappend</entry>
-      <entry><link linkend="oci-collection.append">OCICollection::append</link></entry>
+      <entry><link linkend="ocicollection.append">OCICollection::append</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
       <entry>ocicollassign</entry>
-      <entry><link linkend="oci-collection.assign">OCICollection::assign</link></entry>
+      <entry><link linkend="ocicollection.assign">OCICollection::assign</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
       <entry>ocicollmax</entry>
-      <entry><link linkend="oci-collection.max">OCICollection::max</link></entry>
+      <entry><link linkend="ocicollection.max">OCICollection::max</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
       <entry>ocicollsize</entry>
-      <entry><link linkend="oci-collection.size">OCICollection::size</link></entry>
+      <entry><link linkend="ocicollection.size">OCICollection::size</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
       <entry>ocicolltrim</entry>
-      <entry><link linkend="oci-collection.trim">OCICollection::trim</link></entry>
+      <entry><link linkend="ocicollection.trim">OCICollection::trim</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
@@ -448,7 +448,7 @@
      </row>
      <row>
       <entry>ocifreecollection</entry>
-      <entry><link linkend="oci-collection.free">OCICollection::free</link></entry>
+      <entry><link linkend="ocicollection.free">OCICollection::free</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
@@ -468,7 +468,7 @@
      </row>
      <row>
       <entry>ocigetelem</entry>
-      <entry><link linkend="oci-collection.getelem">OCICollection::getElem</link></entry>
+      <entry><link linkend="ocicollection.getelem">OCICollection::getElem</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
@@ -478,7 +478,7 @@
      </row>
      <row>
       <entry>ociloadlob</entry>
-      <entry><link linkend="oci-lob.load">OCILob::load</link></entry>
+      <entry><link linkend="ocilob.load">OCILob::load</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
@@ -538,12 +538,12 @@
      </row>
      <row>
       <entry>ocisavelob</entry>
-      <entry><link linkend="oci-lob.save">OCILob::save</link></entry>
+      <entry><link linkend="ocilob.save">OCILob::save</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
       <entry>ocisavelobfile</entry>
-      <entry><link linkend="oci-lob.import">OCILob::import</link></entry>
+      <entry><link linkend="ocilob.import">OCILob::import</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
@@ -563,12 +563,12 @@
      </row>
      <row>
       <entry>ociwritelobtofile</entry>
-      <entry><link linkend="oci-lob.export">OCILob::export</link></entry>
+      <entry><link linkend="ocilob.export">OCILob::export</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
       <entry>ociwritetemporarylob</entry>
-      <entry><link linkend="oci-lob.writetemporary">OCILob::writeTemporary</link></entry>
+      <entry><link linkend="ocilob.writetemporary">OCILob::writeTemporary</link></entry>
       <entry><link linkend="ref.oci8">OCI8</link></entry>
      </row>
      <row>
diff --git a/reference/oci8/book.xml b/reference/oci8/book.xml
index c1218a11b8..f2a7f002e4 100644
--- a/reference/oci8/book.xml
+++ b/reference/oci8/book.xml
@@ -28,8 +28,8 @@
  &reference.oci8.dtrace;
  &reference.oci8.datatypes;
  &reference.oci8.reference;
- &reference.oci8.OCI-Collection;
- &reference.oci8.OCI-Lob;
+ &reference.oci8.ocicollection;
+ &reference.oci8.ocilob;
  &reference.oci8.aliases;
 
 </book>
diff --git a/reference/oci8/constants.xml b/reference/oci8/constants.xml
index 5a39961e32..54be140719 100644
--- a/reference/oci8/constants.xml
+++ b/reference/oci8/constants.xml
@@ -86,7 +86,7 @@
        <row xml:id="constant.ocilob-buffer-free">
          <entry><constant>OCI_LOB_BUFFER_FREE</constant></entry>
          <entry>
-           Used with <xref linkend="oci-lob.flush"/> to free
+           Used with <xref linkend="ocilob.flush"/> to free
            buffers used.
          </entry>
        </row>
@@ -126,19 +126,19 @@
        <row xml:id="constant.oci-seek-cur">
          <entry><constant>OCI_SEEK_CUR</constant></entry>
          <entry>
-           Used with <xref linkend="oci-lob.seek" /> to set the seek position.
+           Used with <xref linkend="ocilob.seek" /> to set the seek position.
          </entry>
        </row>
        <row xml:id="constant.oci-seek-end">
          <entry><constant>OCI_SEEK_END</constant></entry>
          <entry>
-           Used with <xref linkend="oci-lob.seek" /> to set the seek position.
+           Used with <xref linkend="ocilob.seek" /> to set the seek position.
          </entry>
        </row>
        <row xml:id="constant.oci-seek-set">
          <entry><constant>OCI_SEEK_SET</constant></entry>
          <entry>
-           Used with <xref linkend="oci-lob.seek" /> to set the seek position.
+           Used with <xref linkend="ocilob.seek" /> to set the seek position.
          </entry>
        </row>
        <row xml:id="constant.oci-sysdate">
@@ -168,14 +168,14 @@
        <row xml:id="constant.oci-temp-blob">
          <entry><constant>OCI_TEMP_BLOB</constant></entry>
          <entry>
-           Used with <xref linkend="oci-lob.writetemporary"/>
+           Used with <xref linkend="ocilob.writetemporary"/>
            to indicate that a temporary BLOB should be created.
          </entry>
        </row>
        <row xml:id="constant.oci-temp-clob">
          <entry><constant>OCI_TEMP_CLOB</constant></entry>
          <entry>
-           Used with <xref linkend="oci-lob.writetemporary"/>
+           Used with <xref linkend="ocilob.writetemporary"/>
            to indicate that a temporary CLOB should be created.
          </entry>
        </row>
diff --git a/reference/oci8/functions/oci-free-descriptor.xml b/reference/oci8/functions/oci-free-descriptor.xml
index 50c546dff0..59fcf09867 100644
--- a/reference/oci8/functions/oci-free-descriptor.xml
+++ b/reference/oci8/functions/oci-free-descriptor.xml
@@ -44,7 +44,7 @@
   &reftitle.notes;
   <note>
    <para>
-    This function is commonly used as a method <link linkend="oci-lob.free">OCILOB::free</link>.
+    This function is commonly used as a method <link linkend="ocilob.free">OCILOB::free</link>.
    </para>
   </note>
  </refsect1>
@@ -54,7 +54,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><link linkend="oci-lob.free">OCILOB::free</link></member>
+    <member><link linkend="ocilob.free">OCILOB::free</link></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/functions/oci-new-collection.xml b/reference/oci8/functions/oci-new-collection.xml
index 409ceb8d69..7e4202eb23 100644
--- a/reference/oci8/functions/oci-new-collection.xml
+++ b/reference/oci8/functions/oci-new-collection.xml
@@ -87,7 +87,7 @@
   &reftitle.notes;
   <note>
    <para>
-    The OCICollection class was called OCI-Collection prior to PHP 8 and OCI8 3.0.0.
+    The <classname>OCICollection</classname> class was called <classname>OCI-Collection</classname> prior to PHP 8 and OCI8 3.0.0.
    </para>
   </note>
   <note>
diff --git a/reference/oci8/functions/oci-set-prefetch-lob.xml b/reference/oci8/functions/oci-set-prefetch-lob.xml
index bb1ee7cb56..73b8835533 100644
--- a/reference/oci8/functions/oci-set-prefetch-lob.xml
+++ b/reference/oci8/functions/oci-set-prefetch-lob.xml
@@ -22,7 +22,7 @@
    between PHP and the database.  Memory usage will change.
   </para>
   <para>
-   The value affects LOBs returned as OCI-Lob instances and also those returned
+   The value affects LOBs returned as OCILob instances and also those returned
    using <constant>OCI_RETURN_LOBS</constant>.
   </para>
   <para>
diff --git a/reference/oci8/ini.xml b/reference/oci8/ini.xml
index 41e4db0808..1a452d19ec 100644
--- a/reference/oci8/ini.xml
+++ b/reference/oci8/ini.xml
@@ -304,7 +304,7 @@
           usage will change.
         </para>
         <para>
-          The value affects LOBs returned as OCI-Lob instances and also those
+          The value affects LOBs returned as OCILob instances and also those
           returned using <constant>OCI_RETURN_LOBS</constant>.
         </para>
         <para>
diff --git a/reference/oci8/OCI-Collection.xml b/reference/oci8/ocicollection.xml
similarity index 67%
rename from reference/oci8/OCI-Collection.xml
rename to reference/oci8/ocicollection.xml
index 35cfba7d16..e239b62c7c 100644
--- a/reference/oci8/OCI-Collection.xml
+++ b/reference/oci8/ocicollection.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.OCI-Collection" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<phpdoc:classref xml:id="class.ocicollection" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The OCICollection class</title>
  <titleabbrev>OCICollection</titleabbrev>
  
  <partintro>
  
 <!-- {{{ ClassName intro -->
-  <section xml:id="OCI-Collection.intro">
+  <section xml:id="ocicollection.intro">
    &reftitle.intro;
    <para>
     OCI8 Collection functionality.
    </para>
    <note>
    <para>
-    The OCI-Collection class was renamed to OCICollection in PHP 8 OCI8 3.0.0 to align with PHP naming standards.
+    The <classname>OCI-Collection</classname> class was renamed to <classname>OCICollection</classname> in PHP 8 OCI8 3.0.0 to align with PHP naming standards.
    </para>
    </note>
   </section>
 
 <!-- }}} -->
  
-  <section xml:id="OCI-Collection.synopsis">
+  <section xml:id="ocicollection.synopsis">
    &reftitle.classsynopsis;
  
 <!-- {{{ Synopsis -->
@@ -37,7 +37,7 @@
     </classsynopsisinfo>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.OCI-Collection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ocicollection')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
@@ -47,7 +47,7 @@
   
  </partintro>
  
- &reference.oci8.entities.OCI-Collection;
+ &reference.oci8.entities.ocicollection;
 
 </phpdoc:classref>
 <!-- Keep this comment at the end of the file
diff --git a/reference/oci8/OCI-Collection/append.xml b/reference/oci8/ocicollection/append.xml
similarity index 93%
rename from reference/oci8/OCI-Collection/append.xml
rename to reference/oci8/ocicollection/append.xml
index 33450779e5..a70b8c2d2c 100644
--- a/reference/oci8/OCI-Collection/append.xml
+++ b/reference/oci8/ocicollection/append.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.append" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.append" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::append</refname>
   <refpurpose>Appends element to the collection</refpurpose>
@@ -67,7 +67,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.assign"/></member>
+    <member><xref linkend="ocicollection.assign"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/assign.xml b/reference/oci8/ocicollection/assign.xml
similarity index 92%
rename from reference/oci8/OCI-Collection/assign.xml
rename to reference/oci8/ocicollection/assign.xml
index 6d9eac3f43..070c500873 100644
--- a/reference/oci8/OCI-Collection/assign.xml
+++ b/reference/oci8/ocicollection/assign.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.assign" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.assign" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::assign</refname>
   <refpurpose>Assigns a value to the collection from another existing collection</refpurpose>
@@ -27,7 +27,7 @@
      <term><parameter>from</parameter></term>
      <listitem>
       <para>
-       An instance of OCI-Collection.
+       An instance of OCICollection.
       </para>
      </listitem>
     </varlistentry>
@@ -69,7 +69,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.append"/></member>
+    <member><xref linkend="ocicollection.append"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/assignElem.xml b/reference/oci8/ocicollection/assignElem.xml
similarity index 94%
rename from reference/oci8/OCI-Collection/assignElem.xml
rename to reference/oci8/ocicollection/assignElem.xml
index c8fa829449..fd9bc5bf7b 100644
--- a/reference/oci8/OCI-Collection/assignElem.xml
+++ b/reference/oci8/ocicollection/assignElem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.assignelem" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.assignelem" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::assignElem</refname>
   <refpurpose>Assigns a value to the element of the collection</refpurpose>
@@ -76,7 +76,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.getelem"/></member>
+    <member><xref linkend="ocicollection.getelem"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/free.xml b/reference/oci8/ocicollection/free.xml
similarity index 96%
rename from reference/oci8/OCI-Collection/free.xml
rename to reference/oci8/ocicollection/free.xml
index 68cda3ff08..ca84c5bcb6 100644
--- a/reference/oci8/OCI-Collection/free.xml
+++ b/reference/oci8/ocicollection/free.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.free" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.free" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::free</refname>
   <refpurpose>Frees the resources associated with the collection object</refpurpose>
diff --git a/reference/oci8/OCI-Collection/getElem.xml b/reference/oci8/ocicollection/getElem.xml
similarity index 94%
rename from reference/oci8/OCI-Collection/getElem.xml
rename to reference/oci8/ocicollection/getElem.xml
index 51749bfbf1..3c644828fe 100644
--- a/reference/oci8/OCI-Collection/getElem.xml
+++ b/reference/oci8/ocicollection/getElem.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.getelem" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.getelem" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::getElem</refname>
   <refpurpose>Returns value of the element</refpurpose>
@@ -69,7 +69,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.assignelem"/></member>
+    <member><xref linkend="ocicollection.assignelem"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/max.xml b/reference/oci8/ocicollection/max.xml
similarity index 93%
rename from reference/oci8/OCI-Collection/max.xml
rename to reference/oci8/ocicollection/max.xml
index 726e84a319..3dcbd0dfbe 100644
--- a/reference/oci8/OCI-Collection/max.xml
+++ b/reference/oci8/ocicollection/max.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.max" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.max" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::max</refname>
   <refpurpose>Returns the maximum number of elements in the collection</refpurpose>
@@ -59,7 +59,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.size"/></member>
+    <member><xref linkend="ocicollection.size"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/size.xml b/reference/oci8/ocicollection/size.xml
similarity index 93%
rename from reference/oci8/OCI-Collection/size.xml
rename to reference/oci8/ocicollection/size.xml
index ab75a8938b..2aaaf249f0 100644
--- a/reference/oci8/OCI-Collection/size.xml
+++ b/reference/oci8/ocicollection/size.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.size" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.size" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::size</refname>
   <refpurpose>Returns size of the collection</refpurpose>
@@ -56,7 +56,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.max"/></member>
+    <member><xref linkend="ocicollection.max"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/trim.xml b/reference/oci8/ocicollection/trim.xml
similarity index 93%
rename from reference/oci8/OCI-Collection/trim.xml
rename to reference/oci8/ocicollection/trim.xml
index baf7881c34..275b432083 100644
--- a/reference/oci8/OCI-Collection/trim.xml
+++ b/reference/oci8/ocicollection/trim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-collection.trim" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocicollection.trim" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCICollection::trim</refname>
   <refpurpose>Trims elements from the end of the collection</refpurpose>
@@ -68,7 +68,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-collection.size"/></member>
+    <member><xref linkend="ocicollection.size"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob.xml b/reference/oci8/ocilob.xml
similarity index 68%
rename from reference/oci8/OCI-Lob.xml
rename to reference/oci8/ocilob.xml
index 16d9625c98..5c5b0f7e0a 100644
--- a/reference/oci8/OCI-Lob.xml
+++ b/reference/oci8/ocilob.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.OCI-Lob" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<phpdoc:classref xml:id="class.ocilob" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The OCILob class</title>
  <titleabbrev>OCILob</titleabbrev>
  
  <partintro>
  
 <!-- {{{ ClassName intro -->
-  <section xml:id="OCI-Lob.intro">
+  <section xml:id="ocilob.intro">
    &reftitle.intro;
    <para>
     OCI8 LOB functionality for large binary (BLOB) and character (CLOB) objects.
    </para>
    <note>
    <para>
-    The OCI-Lob class was renamed to OCILob in PHP 8 and PECL OCI8 3.0.0 to align with PHP naming standards.
+    The <classname>OCI-Lob</classname> class was renamed to <classname>OCILob</classname> in PHP 8 and PECL OCI8 3.0.0 to align with PHP naming standards.
    </para>
    </note>
   </section>
 <!-- }}} -->
  
-  <section xml:id="OCI-Lob.synopsis">
+  <section xml:id="ocilob.synopsis">
    &reftitle.classsynopsis;
  
 <!-- {{{ Synopsis -->
@@ -36,7 +36,7 @@
     </classsynopsisinfo>
 
     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.OCI-Lob')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
+    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.ocilob')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[not(@role='procedural')])">
      <xi:fallback/>
     </xi:include>
    </classsynopsis>
@@ -46,7 +46,7 @@
   
  </partintro>
  
- &reference.oci8.entities.OCI-Lob;
+ &reference.oci8.entities.ocilob;
 
 </phpdoc:classref>
 <!-- Keep this comment at the end of the file
diff --git a/reference/oci8/OCI-Lob/append.xml b/reference/oci8/ocilob/append.xml
similarity index 87%
rename from reference/oci8/OCI-Lob/append.xml
rename to reference/oci8/ocilob/append.xml
index 2ab4737cc5..0f97f0ec3c 100644
--- a/reference/oci8/OCI-Lob/append.xml
+++ b/reference/oci8/ocilob/append.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.append" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.append" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::append</refname>
   <refpurpose>Appends data from the large object to another large object</refpurpose>
@@ -18,7 +18,7 @@
   <para>
    Writing to the large object with this method will fail if buffering was
    previously enabled. You must disable buffering before appending. You may
-   need to flush buffers with <xref linkend="oci-lob.flush"/> before
+   need to flush buffers with <xref linkend="ocilob.flush"/> before
    disabling buffering.
   </para>
  </refsect1>
@@ -73,9 +73,9 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.flush"/></member>
-    <member><xref linkend="oci-lob.setbuffering"/></member>
-    <member><xref linkend="oci-lob.getbuffering"/></member>
+    <member><xref linkend="ocilob.flush"/></member>
+    <member><xref linkend="ocilob.setbuffering"/></member>
+    <member><xref linkend="ocilob.getbuffering"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/close.xml b/reference/oci8/ocilob/close.xml
similarity index 90%
rename from reference/oci8/OCI-Lob/close.xml
rename to reference/oci8/ocilob/close.xml
index 32b4b45ea4..5ac8c52e25 100644
--- a/reference/oci8/OCI-Lob/close.xml
+++ b/reference/oci8/ocilob/close.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.close" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.close" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::close</refname>
   <refpurpose>Closes LOB descriptor</refpurpose>
@@ -14,7 +14,7 @@
   </methodsynopsis>
   <para>
    Closes descriptor of LOB or FILE. This function should be used only with
-   <xref linkend="oci-lob.writetemporary"/>.
+   <xref linkend="ocilob.writetemporary"/>.
   </para>
  </refsect1>
 
@@ -57,7 +57,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.writetemporary"/></member>
+    <member><xref linkend="ocilob.writetemporary"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/eof.xml b/reference/oci8/ocilob/eof.xml
similarity index 92%
rename from reference/oci8/OCI-Lob/eof.xml
rename to reference/oci8/ocilob/eof.xml
index f73b0a0d39..91d7dab9a5 100644
--- a/reference/oci8/OCI-Lob/eof.xml
+++ b/reference/oci8/ocilob/eof.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.eof" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.eof" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::eof</refname>
   <refpurpose>Tests for end-of-file on a large object's descriptor</refpurpose>
@@ -57,7 +57,7 @@
   &reftitle.notes;
   <note>
    <para>
-    This function will return an Oracle error if <xref linkend="oci-lob.setbuffering"/> is enabled on the LOB.
+    This function will return an Oracle error if <xref linkend="ocilob.setbuffering"/> is enabled on the LOB.
    </para>
   </note>
  </refsect1>
@@ -66,7 +66,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.size"/></member>
+    <member><xref linkend="ocilob.size"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/erase.xml b/reference/oci8/ocilob/erase.xml
similarity index 95%
rename from reference/oci8/OCI-Lob/erase.xml
rename to reference/oci8/ocilob/erase.xml
index db2082c144..3026e26f05 100644
--- a/reference/oci8/OCI-Lob/erase.xml
+++ b/reference/oci8/ocilob/erase.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.erase" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.erase" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::erase</refname>
   <refpurpose>Erases a specified portion of the internal LOB data</refpurpose>
@@ -86,7 +86,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.truncate"/></member> 
+    <member><xref linkend="ocilob.truncate"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/export.xml b/reference/oci8/ocilob/export.xml
similarity index 95%
rename from reference/oci8/OCI-Lob/export.xml
rename to reference/oci8/ocilob/export.xml
index bf59339d62..b13281850d 100644
--- a/reference/oci8/OCI-Lob/export.xml
+++ b/reference/oci8/ocilob/export.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.export" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.export" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::export</refname>
   <refpurpose>Exports LOB's contents to a file</refpurpose>
@@ -91,7 +91,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.import"/></member>
+    <member><xref linkend="ocilob.import"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/flush.xml b/reference/oci8/ocilob/flush.xml
similarity index 93%
rename from reference/oci8/OCI-Lob/flush.xml
rename to reference/oci8/ocilob/flush.xml
index 1b15bb153d..98d438c394 100644
--- a/reference/oci8/OCI-Lob/flush.xml
+++ b/reference/oci8/ocilob/flush.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.flush" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.flush" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::flush</refname>
   <refpurpose>Flushes/writes buffer of the LOB to the server</refpurpose>
@@ -76,8 +76,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.getbuffering"/></member>
-    <member><xref linkend="oci-lob.setbuffering"/></member>
+    <member><xref linkend="ocilob.getbuffering"/></member>
+    <member><xref linkend="ocilob.setbuffering"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/free.xml b/reference/oci8/ocilob/free.xml
similarity index 96%
rename from reference/oci8/OCI-Lob/free.xml
rename to reference/oci8/ocilob/free.xml
index cf917a2a41..d0a71b850b 100644
--- a/reference/oci8/OCI-Lob/free.xml
+++ b/reference/oci8/ocilob/free.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.free" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.free" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::free</refname>
   <refpurpose>Frees resources associated with the LOB descriptor</refpurpose>
diff --git a/reference/oci8/OCI-Lob/getBuffering.xml b/reference/oci8/ocilob/getBuffering.xml
similarity index 93%
rename from reference/oci8/OCI-Lob/getBuffering.xml
rename to reference/oci8/ocilob/getBuffering.xml
index b75f4266ef..ea993e4f26 100644
--- a/reference/oci8/OCI-Lob/getBuffering.xml
+++ b/reference/oci8/ocilob/getBuffering.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.getbuffering" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.getbuffering" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::getBuffering</refname>
   <refpurpose>Returns current state of buffering for the large object</refpurpose>
@@ -57,7 +57,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.setbuffering"/></member> 
+    <member><xref linkend="ocilob.setbuffering"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/import.xml b/reference/oci8/ocilob/import.xml
similarity index 91%
rename from reference/oci8/OCI-Lob/import.xml
rename to reference/oci8/ocilob/import.xml
index 9b7f9ddb91..7e1dd7e1cc 100644
--- a/reference/oci8/OCI-Lob/import.xml
+++ b/reference/oci8/ocilob/import.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.import" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.import" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::import</refname>
   <refpurpose>Imports file data to the LOB</refpurpose>
@@ -68,8 +68,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.export"/></member> 
-    <member><xref linkend="oci-lob.write"/></member> 
+    <member><xref linkend="ocilob.export"/></member>
+    <member><xref linkend="ocilob.write"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/load.xml b/reference/oci8/ocilob/load.xml
similarity index 91%
rename from reference/oci8/OCI-Lob/load.xml
rename to reference/oci8/ocilob/load.xml
index 84c3387aaa..3a593fb871 100644
--- a/reference/oci8/OCI-Lob/load.xml
+++ b/reference/oci8/ocilob/load.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.load" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.load" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::load</refname>
   <refpurpose>Returns large object's contents</refpurpose>
@@ -16,7 +16,7 @@
    Returns large object's contents. As script execution is terminated
    when the <link linkend="ini.memory-limit">memory_limit</link> is reached,
    ensure that the LOB does not exceed this limit. In most cases it's
-   recommended to use <xref linkend="oci-lob.read"/> instead. 
+   recommended to use <xref linkend="ocilob.read"/> instead.
   </para>
  </refsect1>
 
@@ -59,7 +59,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.read"/></member>
+    <member><xref linkend="ocilob.read"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/read.xml b/reference/oci8/ocilob/read.xml
similarity index 93%
rename from reference/oci8/OCI-Lob/read.xml
rename to reference/oci8/ocilob/read.xml
index 393c636df0..84ed6a979c 100644
--- a/reference/oci8/OCI-Lob/read.xml
+++ b/reference/oci8/ocilob/read.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.read" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.read" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::read</refname>
   <refpurpose>Reads part of the large object</refpurpose>
@@ -73,8 +73,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.load"/></member> 
-    <member><xref linkend="oci-lob.write"/></member> 
+    <member><xref linkend="ocilob.load"/></member>
+    <member><xref linkend="ocilob.write"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/rewind.xml b/reference/oci8/ocilob/rewind.xml
similarity index 91%
rename from reference/oci8/OCI-Lob/rewind.xml
rename to reference/oci8/ocilob/rewind.xml
index 07bdc7a423..09ff24e7c2 100644
--- a/reference/oci8/OCI-Lob/rewind.xml
+++ b/reference/oci8/ocilob/rewind.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.rewind" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.rewind" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::rewind</refname>
   <refpurpose>Moves the internal pointer to the beginning of the large object</refpurpose>
@@ -56,8 +56,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.seek"/></member> 
-    <member><xref linkend="oci-lob.tell"/></member> 
+    <member><xref linkend="ocilob.seek"/></member>
+    <member><xref linkend="ocilob.tell"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/save.xml b/reference/oci8/ocilob/save.xml
similarity index 93%
rename from reference/oci8/OCI-Lob/save.xml
rename to reference/oci8/ocilob/save.xml
index fce98fb04d..fa64f63354 100644
--- a/reference/oci8/OCI-Lob/save.xml
+++ b/reference/oci8/ocilob/save.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.save" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.save" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::save</refname>
   <refpurpose>Saves data to the large object</refpurpose>
@@ -76,8 +76,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.write"/></member>
-    <member><xref linkend="oci-lob.import"/></member>
+    <member><xref linkend="ocilob.write"/></member>
+    <member><xref linkend="ocilob.import"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/saveFile.xml b/reference/oci8/ocilob/saveFile.xml
similarity index 94%
rename from reference/oci8/OCI-Lob/saveFile.xml
rename to reference/oci8/ocilob/saveFile.xml
index 95be2e3606..6fef355f05 100644
--- a/reference/oci8/OCI-Lob/saveFile.xml
+++ b/reference/oci8/ocilob/saveFile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.savefile" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.savefile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::saveFile</refname>
   <refpurpose>&Alias; <function>OCILob::import</function></refpurpose>
diff --git a/reference/oci8/OCI-Lob/seek.xml b/reference/oci8/ocilob/seek.xml
similarity index 93%
rename from reference/oci8/OCI-Lob/seek.xml
rename to reference/oci8/ocilob/seek.xml
index 10810cc024..37a0e9828f 100644
--- a/reference/oci8/OCI-Lob/seek.xml
+++ b/reference/oci8/ocilob/seek.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.seek" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.seek" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::seek</refname>
   <refpurpose>Sets the internal pointer of the large object</refpurpose>
@@ -92,9 +92,9 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.rewind"/></member>
-    <member><xref linkend="oci-lob.tell"/></member>
-    <member><xref linkend="oci-lob.eof"/></member>
+    <member><xref linkend="ocilob.rewind"/></member>
+    <member><xref linkend="ocilob.tell"/></member>
+    <member><xref linkend="ocilob.eof"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/setBuffering.xml b/reference/oci8/ocilob/setBuffering.xml
similarity index 94%
rename from reference/oci8/OCI-Lob/setBuffering.xml
rename to reference/oci8/ocilob/setBuffering.xml
index c702850535..b591a7b861 100644
--- a/reference/oci8/OCI-Lob/setBuffering.xml
+++ b/reference/oci8/ocilob/setBuffering.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.setbuffering" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.setbuffering" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::setBuffering</refname>
   <refpurpose>Changes current state of buffering for the large object</refpurpose>
@@ -77,7 +77,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.getbuffering"/></member> 
+    <member><xref linkend="ocilob.getbuffering"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/size.xml b/reference/oci8/ocilob/size.xml
similarity index 96%
rename from reference/oci8/OCI-Lob/size.xml
rename to reference/oci8/ocilob/size.xml
index ce4076459f..1335745c28 100644
--- a/reference/oci8/OCI-Lob/size.xml
+++ b/reference/oci8/ocilob/size.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.size" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.size" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::size</refname>
   <refpurpose>Returns size of large object</refpurpose>
diff --git a/reference/oci8/OCI-Lob/tell.xml b/reference/oci8/ocilob/tell.xml
similarity index 89%
rename from reference/oci8/OCI-Lob/tell.xml
rename to reference/oci8/ocilob/tell.xml
index 60e9ccbb0c..f3f543b9fb 100644
--- a/reference/oci8/OCI-Lob/tell.xml
+++ b/reference/oci8/ocilob/tell.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.tell" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.tell" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::tell</refname>
   <refpurpose>Returns the current position of internal pointer of large object</refpurpose>
@@ -57,9 +57,9 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.rewind"/></member>
-    <member><xref linkend="oci-lob.size"/></member>
-    <member><xref linkend="oci-lob.eof"/></member>
+    <member><xref linkend="ocilob.rewind"/></member>
+    <member><xref linkend="ocilob.size"/></member>
+    <member><xref linkend="ocilob.eof"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/truncate.xml b/reference/oci8/ocilob/truncate.xml
similarity index 94%
rename from reference/oci8/OCI-Lob/truncate.xml
rename to reference/oci8/ocilob/truncate.xml
index 5e01ca6177..09822951ce 100644
--- a/reference/oci8/OCI-Lob/truncate.xml
+++ b/reference/oci8/ocilob/truncate.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.truncate" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.truncate" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::truncate</refname>
   <refpurpose>Truncates large object</refpurpose>
@@ -69,7 +69,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.erase"/></member>
+    <member><xref linkend="ocilob.erase"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/write.xml b/reference/oci8/ocilob/write.xml
similarity index 95%
rename from reference/oci8/OCI-Lob/write.xml
rename to reference/oci8/ocilob/write.xml
index 191382552a..a3212958a9 100644
--- a/reference/oci8/OCI-Lob/write.xml
+++ b/reference/oci8/ocilob/write.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.write" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.write" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::write</refname>
   <refpurpose>Writes data to the large object</refpurpose>
@@ -85,7 +85,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.read"/></member> 
+    <member><xref linkend="ocilob.read"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/writeTemporary.xml b/reference/oci8/ocilob/writeTemporary.xml
similarity index 93%
rename from reference/oci8/OCI-Lob/writeTemporary.xml
rename to reference/oci8/ocilob/writeTemporary.xml
index a242d509fb..705c47b3fa 100644
--- a/reference/oci8/OCI-Lob/writeTemporary.xml
+++ b/reference/oci8/ocilob/writeTemporary.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.writetemporary" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.writetemporary" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::writeTemporary</refname>
   <refpurpose>Writes a temporary large object</refpurpose>
@@ -18,7 +18,7 @@
    to it.
   </para>  
   <para>
-   You should use <xref linkend="oci-lob.close"/> when you are done
+   You should use <xref linkend="ocilob.close"/> when you are done
    with this object.
   </para>
  </refsect1>
@@ -90,7 +90,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci-lob.close"/></member> 
+    <member><xref linkend="ocilob.close"/></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/writeToFile.xml b/reference/oci8/ocilob/writeToFile.xml
similarity index 95%
rename from reference/oci8/OCI-Lob/writeToFile.xml
rename to reference/oci8/ocilob/writeToFile.xml
index 07a80ae9dd..9e40a59223 100644
--- a/reference/oci8/OCI-Lob/writeToFile.xml
+++ b/reference/oci8/ocilob/writeToFile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<refentry xml:id="oci-lob.writetofile" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="ocilob.writetofile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCILob::writeToFile</refname>
   <refpurpose>&Alias; <function>OCILob::export</function></refpurpose>
diff --git a/reference/oci8/oldaliases/ocicloselob.xml b/reference/oci8/oldaliases/ocicloselob.xml
index 03bbcde900..2d14661995 100644
--- a/reference/oci8/oldaliases/ocicloselob.xml
+++ b/reference/oci8/oldaliases/ocicloselob.xml
@@ -3,12 +3,12 @@
 <refentry xml:id="function.ocicloselob" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ocicloselob</refname>
-  <refpurpose>&Alias; <function>OCI-Lob::close</function></refpurpose>
+  <refpurpose>&Alias; <function>OCILob::close</function></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>&Alias; <function>OCI-Lob::close</function></para>
+  <para>&Alias; <function>OCILob::close</function></para>
   &warn.deprecated.alias-5-4-0;
  </refsect1>
 
diff --git a/reference/oci8/oldaliases/ocifreedesc.xml b/reference/oci8/oldaliases/ocifreedesc.xml
index f59f4b1e9c..fcad98ff79 100644
--- a/reference/oci8/oldaliases/ocifreedesc.xml
+++ b/reference/oci8/oldaliases/ocifreedesc.xml
@@ -3,12 +3,12 @@
 <refentry xml:id="function.ocifreedesc" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ocifreedesc</refname>
-  <refpurpose>&Alias; <function>OCI-Lob::free</function></refpurpose>
+  <refpurpose>&Alias; <function>OCILob::free</function></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>&Alias; <function>OCI-Lob::free</function></para>
+  <para>&Alias; <function>OCILob::free</function></para>
   &warn.deprecated.alias-5-4-0;
  </refsect1>
 
diff --git a/reference/oci8/oldaliases/ociloadlob.xml b/reference/oci8/oldaliases/ociloadlob.xml
index a302e5d22e..952fd3b836 100644
--- a/reference/oci8/oldaliases/ociloadlob.xml
+++ b/reference/oci8/oldaliases/ociloadlob.xml
@@ -3,12 +3,12 @@
 <refentry xml:id="function.ociloadlob" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ociloadlob</refname>
-  <refpurpose>&Alias; <function>OCI-Lob::load</function></refpurpose>
+  <refpurpose>&Alias; <function>OCILob::load</function></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>&Alias; <function>OCI-Lob::load</function></para>
+  <para>&Alias; <function>OCILob::load</function></para>
   &warn.deprecated.alias-5-4-0;
  </refsect1>
 
diff --git a/reference/oci8/oldaliases/ocisavelob.xml b/reference/oci8/oldaliases/ocisavelob.xml
index 0a59cda4a7..e078d75c94 100644
--- a/reference/oci8/oldaliases/ocisavelob.xml
+++ b/reference/oci8/oldaliases/ocisavelob.xml
@@ -3,12 +3,12 @@
 <refentry xml:id="function.ocisavelob" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ocisavelob</refname>
-  <refpurpose>&Alias; <function>OCI-Lob::save</function></refpurpose>
+  <refpurpose>&Alias; <function>OCILob::save</function></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>&Alias; <function>OCI-Lob::save</function></para>
+  <para>&Alias; <function>OCILob::save</function></para>
   &warn.deprecated.alias-5-4-0;
  </refsect1>
 
diff --git a/reference/oci8/oldaliases/ocisavelobfile.xml b/reference/oci8/oldaliases/ocisavelobfile.xml
index 48b2c459f6..d1e504b079 100644
--- a/reference/oci8/oldaliases/ocisavelobfile.xml
+++ b/reference/oci8/oldaliases/ocisavelobfile.xml
@@ -3,12 +3,12 @@
 <refentry xml:id="function.ocisavelobfile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ocisavelobfile</refname>
-  <refpurpose>&Alias; <function>OCI-Lob::import</function></refpurpose>
+  <refpurpose>&Alias; <function>OCILob::import</function></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>&Alias; <function>OCI-Lob::import</function></para>
+  <para>&Alias; <function>OCILob::import</function></para>
   &warn.deprecated.alias-5-4-0;
  </refsect1>
 
diff --git a/reference/oci8/oldaliases/ociwritelobtofile.xml b/reference/oci8/oldaliases/ociwritelobtofile.xml
index 585244773b..cb0406c6b2 100644
--- a/reference/oci8/oldaliases/ociwritelobtofile.xml
+++ b/reference/oci8/oldaliases/ociwritelobtofile.xml
@@ -3,12 +3,12 @@
 <refentry xml:id="function.ociwritelobtofile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ociwritelobtofile</refname>
-  <refpurpose>&Alias; <function>OCI-Lob::export</function></refpurpose>
+  <refpurpose>&Alias; <function>OCILob::export</function></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>&Alias; <function>OCI-Lob::export</function></para>
+  <para>&Alias; <function>OCILob::export</function></para>
   &warn.deprecated.alias-5-4-0;
  </refsect1>
 
diff --git a/reference/oci8/oldaliases/ociwritetemporarylob.xml b/reference/oci8/oldaliases/ociwritetemporarylob.xml
index 8efd147189..3203e56e8e 100644
--- a/reference/oci8/oldaliases/ociwritetemporarylob.xml
+++ b/reference/oci8/oldaliases/ociwritetemporarylob.xml
@@ -3,12 +3,12 @@
 <refentry xml:id="function.ociwritetemporarylob" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>ociwritetemporarylob</refname>
-  <refpurpose>&Alias; <function>OCI-Lob::writeTemporary</function></refpurpose>
+  <refpurpose>&Alias; <function>OCILob::writeTemporary</function></refpurpose>
  </refnamediv>
 
  <refsect1 role="description">
   &reftitle.description;
-  <para>&Alias; <function>OCI-Lob::writeTemporary</function></para>
+  <para>&Alias; <function>OCILob::writeTemporary</function></para>
   &warn.deprecated.alias-5-4-0;
  </refsect1>