diff --git a/reference/dba/dba.connection.xml b/reference/dba/dba.connection.xml
index 32598b6f5f82..bd15d9625df3 100644
--- a/reference/dba/dba.connection.xml
+++ b/reference/dba/dba.connection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.dba-connection" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.dba-connection" role="class">
  <title>The Dba\Connection class</title>
  <titleabbrev>Dba\Connection</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>Dba\Connection</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>Dba</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Connection</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/ffi/ffi.cdata.xml b/reference/ffi/ffi.cdata.xml
index 011c55d0694f..aeec0b3e3fbc 100644
--- a/reference/ffi/ffi.cdata.xml
+++ b/reference/ffi/ffi.cdata.xml
@@ -102,12 +102,16 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>FFI\CData</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>FFI</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>CData</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/ftp/ftp.connection.xml b/reference/ftp/ftp.connection.xml
index 398ff1178a7e..7fcf895fdc7b 100644
--- a/reference/ftp/ftp.connection.xml
+++ b/reference/ftp/ftp.connection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.ftp-connection" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.ftp-connection" role="class">
  <title>The FTP\Connection class</title>
  <titleabbrev>FTP\Connection</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>FTP\Connection</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>FTP</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Connection</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/ldap/ldap.connection.xml b/reference/ldap/ldap.connection.xml
index e66a2eac76b0..f095921d7eb7 100644
--- a/reference/ldap/ldap.connection.xml
+++ b/reference/ldap/ldap.connection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.ldap-connection" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.ldap-connection" role="class">
  <title>The LDAP\Connection class</title>
  <titleabbrev>LDAP\Connection</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>LDAP\Connection</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>LDAP</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Connection</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/ldap/ldap.result.xml b/reference/ldap/ldap.result.xml
index 05a29f622433..637d0b32e4df 100644
--- a/reference/ldap/ldap.result.xml
+++ b/reference/ldap/ldap.result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.ldap-result" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.ldap-result" role="class">
  <title>The LDAP\Result class</title>
  <titleabbrev>LDAP\Result</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>LDAP\Result</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>LDAP</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Result</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/ldap/ldap.resultentry.xml b/reference/ldap/ldap.resultentry.xml
index 19438f55453e..1a9b51cb4c31 100644
--- a/reference/ldap/ldap.resultentry.xml
+++ b/reference/ldap/ldap.resultentry.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.ldap-result-entry" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.ldap-result-entry" role="class">
  <title>The LDAP\ResultEntry class</title>
  <titleabbrev>LDAP\ResultEntry</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>LDAP\ResultEntry</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>LDAP</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>ResultEntry</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/pgsql/pgsql.connection.xml b/reference/pgsql/pgsql.connection.xml
index 9d8519cb7ab5..bebe11eccc7a 100644
--- a/reference/pgsql/pgsql.connection.xml
+++ b/reference/pgsql/pgsql.connection.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.pgsql-connection" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.pgsql-connection" role="class">
  <title>The PgSql\Connection class</title>
  <titleabbrev>PgSql\Connection</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>PgSql\Connection</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>PgSql</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Connection</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/pgsql/pgsql.lob.xml b/reference/pgsql/pgsql.lob.xml
index fa53698c37b9..1ccfc226b5ea 100644
--- a/reference/pgsql/pgsql.lob.xml
+++ b/reference/pgsql/pgsql.lob.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.pgsql-lob" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.pgsql-lob" role="class">
  <title>The PgSql\Lob class</title>
  <titleabbrev>PgSql\Lob</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>PgSql\Lob</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>PgSql</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Lob</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>
diff --git a/reference/pgsql/pgsql.result.xml b/reference/pgsql/pgsql.result.xml
index 88ae75c047b5..8365459e22d2 100644
--- a/reference/pgsql/pgsql.result.xml
+++ b/reference/pgsql/pgsql.result.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<reference xml:id="class.pgsql-result" role="class" xmlns="http://docbook.org/ns/docbook">
+<reference xmlns="http://docbook.org/ns/docbook" xml:id="class.pgsql-result" role="class">
  <title>The PgSql\Result class</title>
  <titleabbrev>PgSql\Result</titleabbrev>
 
@@ -18,12 +18,16 @@
    &reftitle.classsynopsis;
 
    <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>PgSql\Result</classname>
-    </ooclass>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>PgSql</package>
+
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Result</classname>
+     </ooclass>
+    </classsynopsis>
+   </packagesynopsis>
    <!-- }}} -->
 
   </section>