diff --git a/reference/oci8/OCI-Collection/append.xml b/reference/oci8/OCI-Collection/append.xml
index 2c9f61a4be..4a45f1f8e3 100644
--- a/reference/oci8/OCI-Collection/append.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.append" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::append</refname>
   <refpurpose>Appends element to the collection</refpurpose>
@@ -47,7 +47,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.collection-assign" /></member>
+    <member><xref linkend="oci-collection.assign" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/assign.xml b/reference/oci8/OCI-Collection/assign.xml
index 9bc3b026ee..c7d53f1c57 100644
--- a/reference/oci8/OCI-Collection/assign.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.assign" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::assign</refname>
   <refpurpose>Assigns a value to the collection from another existing collection</refpurpose>
@@ -49,7 +49,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.collection-append" /></member>
+    <member><xref linkend="oci-collection.append" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/assignElem.xml b/reference/oci8/OCI-Collection/assignElem.xml
index 4404011020..43788b4c9d 100644
--- a/reference/oci8/OCI-Collection/assignElem.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.assignelem" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::assignElem</refname>
   <refpurpose>Assigns a value to the element of the collection</refpurpose>
@@ -56,7 +56,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.collection-getelem" /></member>
+    <member><xref linkend="oci-collection.getelem" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/free.xml b/reference/oci8/OCI-Collection/free.xml
index e0ca4468b7..114183fc9a 100644
--- a/reference/oci8/OCI-Collection/free.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.free" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::free</refname>
   <refpurpose>Frees the resources associated with the collection object</refpurpose>
diff --git a/reference/oci8/OCI-Collection/getElem.xml b/reference/oci8/OCI-Collection/getElem.xml
index 41051fde21..fe3eb3be96 100644
--- a/reference/oci8/OCI-Collection/getElem.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.getelem" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::getElem</refname>
   <refpurpose>Returns value of the element</refpurpose>
@@ -49,7 +49,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.collection-assignelem" /></member>
+    <member><xref linkend="oci-collection.assignelem" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/max.xml b/reference/oci8/OCI-Collection/max.xml
index 04255a075a..6578b8db13 100644
--- a/reference/oci8/OCI-Collection/max.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.max" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::max</refname>
   <refpurpose>Returns the maximum number of elements in the collection</refpurpose>
@@ -34,7 +34,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.collection-size" /></member>
+    <member><xref linkend="oci-collection.size" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/size.xml b/reference/oci8/OCI-Collection/size.xml
index 5cfe0f4fef..5d8389c579 100644
--- a/reference/oci8/OCI-Collection/size.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.size" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::size</refname>
   <refpurpose>Returns size of the collection</refpurpose>
@@ -31,7 +31,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.collection-max" /></member>
+    <member><xref linkend="oci-collection.max" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Collection/trim.xml b/reference/oci8/OCI-Collection/trim.xml
index 47e144b804..02066d16e4 100644
--- a/reference/oci8/OCI-Collection/trim.xml
+++ b/reference/oci8/OCI-Collection/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="oci-collection.trim" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Collection::trim</refname>
   <refpurpose>Trims elements from the end of the collection</refpurpose>
@@ -48,7 +48,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.collection-size" /></member>
+    <member><xref linkend="oci-collection.size" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/append.xml b/reference/oci8/OCI-Lob/append.xml
index 633621f4d9..6e6bd024e7 100644
--- a/reference/oci8/OCI-Lob/append.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.append" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::append</refname>
   <refpurpose>Appends data from the large object to another large object</refpurpose>
@@ -21,7 +21,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="oci-lob.flush"/> before
    disabling buffering.
   </para>
  </refsect1>
@@ -53,9 +53,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="oci-lob.flush" /></member>
+    <member><xref linkend="oci-lob.setbuffering" /></member>
+    <member><xref linkend="oci-lob.getbuffering" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/close.xml b/reference/oci8/OCI-Lob/close.xml
index 1be6e591fa..71297803b5 100644
--- a/reference/oci8/OCI-Lob/close.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.close" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::close</refname>
   <refpurpose>Closes LOB descriptor</refpurpose>
@@ -17,7 +17,7 @@
   </classsynopsis>
   <para>
    Closes descriptor of LOB or FILE. This function should be used only with
-   <xref linkend="oci.lob-writetemporary" />.
+   <xref linkend="oci-lob.writetemporary" />.
   </para>
  </refsect1>
 
@@ -32,7 +32,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-writetemporary" /></member>
+    <member><xref linkend="oci-lob.writetemporary" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/eof.xml b/reference/oci8/OCI-Lob/eof.xml
index 075fb6ac0d..597947b606 100644
--- a/reference/oci8/OCI-Lob/eof.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.eof" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::eof</refname>
   <refpurpose>Tests for end-of-file on a large object's descriptor</refpurpose>
@@ -32,7 +32,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-size" /></member>
+    <member><xref linkend="oci-lob.size" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/erase.xml b/reference/oci8/OCI-Lob/erase.xml
index a14b838968..447d005809 100644
--- a/reference/oci8/OCI-Lob/erase.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.erase" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::erase</refname>
   <refpurpose>Erases a specified portion of the internal LOB data</refpurpose>
@@ -60,7 +60,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-truncate" /></member> 
+    <member><xref linkend="oci-lob.truncate" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/export.xml b/reference/oci8/OCI-Lob/export.xml
index 07b6d56a8d..93df415bb3 100644
--- a/reference/oci8/OCI-Lob/export.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.export" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::export</refname>
   <refpurpose>Exports LOB's contents to a file</refpurpose>
@@ -65,7 +65,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-import" /></member>
+    <member><xref linkend="oci-lob.import" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/flush.xml b/reference/oci8/OCI-Lob/flush.xml
index d5157bc85d..819197a4d1 100644
--- a/reference/oci8/OCI-Lob/flush.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.flush" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::flush</refname>
   <refpurpose>Flushes/writes buffer of the LOB to the server</refpurpose>
@@ -56,8 +56,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-getbuffering" /></member>
-    <member><xref linkend="oci.lob-setbuffering" /></member>
+    <member><xref linkend="oci-lob.getbuffering" /></member>
+    <member><xref linkend="oci-lob.setbuffering" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/free.xml b/reference/oci8/OCI-Lob/free.xml
index 044c87fc9b..bc24e39b05 100644
--- a/reference/oci8/OCI-Lob/free.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.free" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::free</refname>
   <refpurpose>Frees resources associated with the LOB descriptor</refpurpose>
diff --git a/reference/oci8/OCI-Lob/getBuffering.xml b/reference/oci8/OCI-Lob/getBuffering.xml
index dd230a4369..8d1ef6d328 100644
--- a/reference/oci8/OCI-Lob/getBuffering.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.getbuffering" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::getBuffering</refname>
   <refpurpose>Returns current state of buffering for the large object</refpurpose>
@@ -32,7 +32,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-setbuffering" /></member> 
+    <member><xref linkend="oci-lob.setbuffering" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/import.xml b/reference/oci8/OCI-Lob/import.xml
index c0a335077e..8c1b105ecf 100644
--- a/reference/oci8/OCI-Lob/import.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.import" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::import</refname>
   <refpurpose>Imports file data to the LOB</refpurpose>
@@ -48,8 +48,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-export" /></member> 
-    <member><xref linkend="oci.lob-write" /></member> 
+    <member><xref linkend="oci-lob.export" /></member> 
+    <member><xref linkend="oci-lob.write" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/load.xml b/reference/oci8/OCI-Lob/load.xml
index dd8d6df34d..404c527572 100644
--- a/reference/oci8/OCI-Lob/load.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.load" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::load</refname>
   <refpurpose>Returns large object's contents</refpurpose>
@@ -19,7 +19,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="oci-lob.read" /> instead. 
   </para>
  </refsect1>
 
@@ -34,7 +34,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-read" /></member>
+    <member><xref linkend="oci-lob.read" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/read.xml b/reference/oci8/OCI-Lob/read.xml
index 521922dfbb..6c5207513e 100644
--- a/reference/oci8/OCI-Lob/read.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.read" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::read</refname>
   <refpurpose>Reads part of the large object</refpurpose>
@@ -53,8 +53,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-load" /></member> 
-    <member><xref linkend="oci.lob-write" /></member> 
+    <member><xref linkend="oci-lob.load" /></member> 
+    <member><xref linkend="oci-lob.write" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/rewind.xml b/reference/oci8/OCI-Lob/rewind.xml
index c72b99badb..20e953dc38 100644
--- a/reference/oci8/OCI-Lob/rewind.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.rewind" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::rewind</refname>
   <refpurpose>Moves the internal pointer to the beginning of the large object</refpurpose>
@@ -31,8 +31,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-seek" /></member> 
-    <member><xref linkend="oci.lob-tell" /></member> 
+    <member><xref linkend="oci-lob.seek" /></member> 
+    <member><xref linkend="oci-lob.tell" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/save.xml b/reference/oci8/OCI-Lob/save.xml
index 8f8e454e0e..dc03461ab6 100644
--- a/reference/oci8/OCI-Lob/save.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.save" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::save</refname>
   <refpurpose>Saves data to the large object</refpurpose>
@@ -56,8 +56,8 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-write" /></member>
-    <member><xref linkend="oci.lob-import" /></member>
+    <member><xref linkend="oci-lob.write" /></member>
+    <member><xref linkend="oci-lob.import" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/saveFile.xml b/reference/oci8/OCI-Lob/saveFile.xml
index 7f61611066..3e20fb5c47 100644
--- a/reference/oci8/OCI-Lob/saveFile.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.savefile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::saveFile</refname>
   <refpurpose>&Alias; <function>OCI-Lob::import</function></refpurpose>
diff --git a/reference/oci8/OCI-Lob/seek.xml b/reference/oci8/OCI-Lob/seek.xml
index 80f9bb2bde..1a58aa2f38 100644
--- a/reference/oci8/OCI-Lob/seek.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.seek" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::seek</refname>
   <refpurpose>Sets the internal pointer of the large object</refpurpose>
@@ -72,9 +72,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="oci-lob.rewind" /></member>
+    <member><xref linkend="oci-lob.tell" /></member>
+    <member><xref linkend="oci-lob.eof" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/setBuffering.xml b/reference/oci8/OCI-Lob/setBuffering.xml
index 10ed75ea42..691832ee20 100644
--- a/reference/oci8/OCI-Lob/setBuffering.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.setbuffering" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::setBuffering</refname>
   <refpurpose>Changes current state of buffering for the large object</refpurpose>
@@ -57,7 +57,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-getbuffering" /></member> 
+    <member><xref linkend="oci-lob.getbuffering" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/size.xml b/reference/oci8/OCI-Lob/size.xml
index 27260d526f..949fd6f87c 100644
--- a/reference/oci8/OCI-Lob/size.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.size" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::size</refname>
   <refpurpose>Returns size of large object</refpurpose>
diff --git a/reference/oci8/OCI-Lob/tell.xml b/reference/oci8/OCI-Lob/tell.xml
index a7f1227cb7..4ff47f888d 100644
--- a/reference/oci8/OCI-Lob/tell.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.tell" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::tell</refname>
   <refpurpose>Returns the current position of internal pointer of large object</refpurpose>
@@ -32,9 +32,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="oci-lob.rewind" /></member>
+    <member><xref linkend="oci-lob.size" /></member>
+    <member><xref linkend="oci-lob.eof" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/truncate.xml b/reference/oci8/OCI-Lob/truncate.xml
index 2f9de1ac52..d1b25e3db2 100644
--- a/reference/oci8/OCI-Lob/truncate.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.truncate" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::truncate</refname>
   <refpurpose>Truncates large object</refpurpose>
@@ -49,7 +49,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-erase" /></member>
+    <member><xref linkend="oci-lob.erase" /></member>
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/write.xml b/reference/oci8/OCI-Lob/write.xml
index 6ac15e7c96..2312177f36 100644
--- a/reference/oci8/OCI-Lob/write.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.write" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::write</refname>
   <refpurpose>Writes data to the large object</refpurpose>
@@ -59,7 +59,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-read" /></member> 
+    <member><xref linkend="oci-lob.read" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/writeTemporary.xml b/reference/oci8/OCI-Lob/writeTemporary.xml
index 09db42669f..536508627d 100644
--- a/reference/oci8/OCI-Lob/writeTemporary.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.writetemporary" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::writeTemporary</refname>
   <refpurpose>Writes a temporary large object</refpurpose>
@@ -21,7 +21,7 @@
    to it.
   </para>  
   <para>
-   You should use <xref linkend="oci.lob-close" /> when you are done
+   You should use <xref linkend="oci-lob.close" /> when you are done
    with this object.
   </para>
  </refsect1>
@@ -70,7 +70,7 @@
   &reftitle.seealso;
   <para>
    <simplelist>
-    <member><xref linkend="oci.lob-close" /></member> 
+    <member><xref linkend="oci-lob.close" /></member> 
    </simplelist>
   </para>
  </refsect1>
diff --git a/reference/oci8/OCI-Lob/writeToFile.xml b/reference/oci8/OCI-Lob/writeToFile.xml
index b2a80be843..454df72bd0 100644
--- a/reference/oci8/OCI-Lob/writeToFile.xml
+++ b/reference/oci8/OCI-Lob/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="oci-lob.writetofile" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>OCI-Lob::writeToFile</refname>
   <refpurpose>&Alias; <function>OCI-Lob::export</function></refpurpose>
diff --git a/reference/oci8/constants.xml b/reference/oci8/constants.xml
index 7022604721..6fa0379a51 100644
--- a/reference/oci8/constants.xml
+++ b/reference/oci8/constants.xml
@@ -91,7 +91,7 @@
        <row>
          <entry><constant>OCI_LOB_BUFFER_FREE</constant></entry>
          <entry>
-           Used with <xref linkend="oci.lob-flush"/> to free
+           Used with <xref linkend="oci-lob.flush"/> to free
            buffers used.
          </entry>
        </row>
@@ -131,19 +131,19 @@
        <row>
          <entry><constant>OCI_SEEK_CUR</constant></entry>
          <entry>
-           Used with <xref linkend="oci.lob-seek" /> to set the seek position.
+           Used with <xref linkend="oci-lob.seek" /> to set the seek position.
          </entry>
        </row>
        <row>
          <entry><constant>OCI_SEEK_END</constant></entry>
          <entry>
-           Used with <xref linkend="oci.lob-seek" /> to set the seek position.
+           Used with <xref linkend="oci-lob.seek" /> to set the seek position.
          </entry>
        </row>
        <row>
          <entry><constant>OCI_SEEK_SET</constant></entry>
          <entry>
-           Used with <xref linkend="oci.lob-seek" /> to set the seek position.
+           Used with <xref linkend="oci-lob.seek" /> to set the seek position.
          </entry>
        </row>
        <row>
@@ -173,14 +173,14 @@
        <row>
          <entry><constant>OCI_TEMP_BLOB</constant></entry>
          <entry>
-           Used with <xref linkend="oci.lob-writetemporary"/>
+           Used with <xref linkend="oci-lob.writetemporary"/>
            to indicate that a temporary BLOB should be created.
          </entry>
        </row>
        <row>
          <entry><constant>OCI_TEMP_CLOB</constant></entry>
          <entry>
-           Used with <xref linkend="oci.lob-writetemporary"/>
+           Used with <xref linkend="oci-lob.writetemporary"/>
            to indicate that a temporary CLOB should be created.
          </entry>
        </row>
diff --git a/reference/sca/SCA_LocalProxy/createDataObject.xml b/reference/sca/SCA_LocalProxy/createDataObject.xml
index 5e9e6aa7cb..263c9f1fc1 100644
--- a/reference/sca/SCA_LocalProxy/createDataObject.xml
+++ b/reference/sca/SCA_LocalProxy/createDataObject.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="sca.localproxy-createdataobject" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="sca-localproxy.createdataobject" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>SCA_LocalProxy::createDataObject</refname>
   <refpurpose> create an SDO </refpurpose>
diff --git a/reference/sca/SCA_SoapProxy/createDataObject.xml b/reference/sca/SCA_SoapProxy/createDataObject.xml
index b8a0c28558..af5885d1ee 100644
--- a/reference/sca/SCA_SoapProxy/createDataObject.xml
+++ b/reference/sca/SCA_SoapProxy/createDataObject.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
 <!-- Generated by xml_proto.php v2.2. Found in /scripts directory of phpdoc. -->
-<refentry xml:id="sca.soapproxy-createdataobject" xmlns="http://docbook.org/ns/docbook">
+<refentry xml:id="sca-soapproxy.createdataobject" xmlns="http://docbook.org/ns/docbook">
  <refnamediv>
   <refname>SCA_SoapProxy::createDataObject</refname>
   <refpurpose> create an SDO </refpurpose>
diff --git a/reference/sca/reference.xml b/reference/sca/reference.xml
index 8fdcb9f4e4..e5b0ea62c9 100644
--- a/reference/sca/reference.xml
+++ b/reference/sca/reference.xml
@@ -88,7 +88,7 @@
       <listitem>
        <para>
         <link
-         linkend="sca.localproxy-createdataobject">
+         linkend="sca-localproxy.createdataobject">
          createDataObject</link> - create an SDO 
        </para>
       </listitem>
@@ -126,7 +126,7 @@
       <listitem>
        <para>
         <link
-         linkend="sca.soapproxy-createdataobject">
+         linkend="sca-soapproxy.createdataobject">
          createDataObject</link> - create an SDO 
        </para>
       </listitem>