diff --git a/reference/random/random.brokenrandomengineerror.xml b/reference/random/random.brokenrandomengineerror.xml
index 61dbb283e..0b2685fa4 100644
--- a/reference/random/random.brokenrandomengineerror.xml
+++ b/reference/random/random.brokenrandomengineerror.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-brokenrandomengineerror" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\BrokenRandomEngineError</title>
  <titleabbrev>Random\BrokenRandomEngineError</titleabbrev>
@@ -18,29 +18,33 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Random\BrokenRandomEngineError</exceptionname>
-    </ooexception>
+   <packagesynopsis>
+    <package>Random</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Random\RandomError</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooexception>
+      <exceptionname>BrokenRandomEngineError</exceptionname>
+     </ooexception>
 
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>Random\RandomError</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
+      <xi:fallback/>
+     </xi:include>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.cryptosafeengine.xml b/reference/random/random.cryptosafeengine.xml
index d4d950634..f9c149ac6 100644
--- a/reference/random/random.cryptosafeengine.xml
+++ b/reference/random/random.cryptosafeengine.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 9eb4a46bba05da229be4c8f7a3cb64702e1a2f95 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-cryptosafeengine" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A interface Random\CryptoSafeEngine</title>
  <titleabbrev>Random\CryptoSafeEngine</titleabbrev>
@@ -18,21 +18,25 @@
    &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="interface">
-    <oointerface>
-     <interfacename>Random\CryptoSafeEngine</interfacename>
-    </oointerface>
-
-    <oointerface>
-     <modifier>extends</modifier>
-     <interfacename>Random\Engine</interfacename>
-    </oointerface>
-
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+   <packagesynopsis>
+    <package>Random</package>
+
+    <classsynopsis class="interface">
+     <oointerface>
+      <interfacename>CryptoSafeEngine</interfacename>
+     </oointerface>
+
+     <oointerface>
+      <modifier>extends</modifier>
+      <interfacename>Random\Engine</interfacename>
+     </oointerface>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.engine.mt19937.xml b/reference/random/random.engine.mt19937.xml
index cf05645c8..cbe5893b0 100644
--- a/reference/random/random.engine.mt19937.xml
+++ b/reference/random/random.engine.mt19937.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-engine-mt19937" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\Engine\Mt19937</title>
  <titleabbrev>Random\Engine\Mt19937</titleabbrev>
@@ -18,25 +18,29 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>Random\Engine\Mt19937</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Random\Engine</package>
 
-    <oointerface>
-     <modifier>implements</modifier>
-     <interfacename>Random\Engine</interfacename>
-    </oointerface>
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Mt19937</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-mt19937')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Engine\\Mt19937'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-mt19937')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\Mt19937'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <oointerface>
+      <modifier>implements</modifier>
+      <interfacename>Random\Engine</interfacename>
+     </oointerface>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-mt19937')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Engine\\Mt19937'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-mt19937')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\Mt19937'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.engine.pcgoneseq128xslrr64.xml b/reference/random/random.engine.pcgoneseq128xslrr64.xml
index 9102a3ca5..29c4c63ca 100644
--- a/reference/random/random.engine.pcgoneseq128xslrr64.xml
+++ b/reference/random/random.engine.pcgoneseq128xslrr64.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-engine-pcgoneseq128xslrr64" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\Engine\PcgOneseq128XslRr64</title>
  <titleabbrev>Random\Engine\PcgOneseq128XslRr64</titleabbrev>
@@ -19,25 +19,29 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>Random\Engine\PcgOneseq128XslRr64</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Random\Engine</package>
 
-    <oointerface>
-     <modifier>implements</modifier>
-     <interfacename>Random\Engine</interfacename>
-    </oointerface>
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>PcgOneseq128XslRr64</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-pcgoneseq128xslrr64')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Engine\\PcgOneseq128XslRr64'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-pcgoneseq128xslrr64')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\PcgOneseq128XslRr64'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <oointerface>
+      <modifier>implements</modifier>
+      <interfacename>Random\Engine</interfacename>
+     </oointerface>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-pcgoneseq128xslrr64')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Engine\\PcgOneseq128XslRr64'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-pcgoneseq128xslrr64')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\PcgOneseq128XslRr64'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.engine.secure.xml b/reference/random/random.engine.secure.xml
index 45ef00167..548e8e655 100644
--- a/reference/random/random.engine.secure.xml
+++ b/reference/random/random.engine.secure.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-engine-secure" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\Engine\Secure</title>
  <titleabbrev>Random\Engine\Secure</titleabbrev>
@@ -27,22 +27,26 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>Random\Engine\Secure</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Random\Engine</package>
 
-    <oointerface>
-     <modifier>implements</modifier>
-     <interfacename>Random\CryptoSafeEngine</interfacename>
-    </oointerface>
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Secure</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-secure')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\Secure'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <oointerface>
+      <modifier>implements</modifier>
+      <interfacename>Random\CryptoSafeEngine</interfacename>
+     </oointerface>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-secure')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\Secure'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.engine.xml b/reference/random/random.engine.xml
index 01fba9ce0..2604a1bc0 100644
--- a/reference/random/random.engine.xml
+++ b/reference/random/random.engine.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 9eb4a46bba05da229be4c8f7a3cb64702e1a2f95 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-engine" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The Random\Engine interface</title>
  <titleabbrev>Random\Engine</titleabbrev>
@@ -32,16 +32,20 @@
    &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="interface">
-    <oointerface>
-     <interfacename>Random\Engine</interfacename>
-    </oointerface>
+   <packagesynopsis>
+    <package>Random</package>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+    <classsynopsis class="interface">
+     <oointerface>
+      <interfacename>Engine</interfacename>
+     </oointerface>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.engine.xoshiro256starstar.xml b/reference/random/random.engine.xoshiro256starstar.xml
index bde97d985..8425d8086 100644
--- a/reference/random/random.engine.xoshiro256starstar.xml
+++ b/reference/random/random.engine.xoshiro256starstar.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-engine-xoshiro256starstar" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\Engine\Xoshiro256StarStar</title>
  <titleabbrev>Random\Engine\Xoshiro256StarStar</titleabbrev>
@@ -18,25 +18,29 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>Random\Engine\Xoshiro256StarStar</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Random\Engine</package>
 
-    <oointerface>
-     <modifier>implements</modifier>
-     <interfacename>Random\Engine</interfacename>
-    </oointerface>
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Xoshiro256StarStar</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-xoshiro256starstar')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Engine\\Xoshiro256StarStar'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-xoshiro256starstar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\Xoshiro256StarStar'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <oointerface>
+      <modifier>implements</modifier>
+      <interfacename>Random\Engine</interfacename>
+     </oointerface>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-xoshiro256starstar')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Engine\\Xoshiro256StarStar'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-engine-xoshiro256starstar')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Engine\\Xoshiro256StarStar'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.randomerror.xml b/reference/random/random.randomerror.xml
index 8171f039f..335a1756d 100644
--- a/reference/random/random.randomerror.xml
+++ b/reference/random/random.randomerror.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-randomerror" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\RandomError</title>
  <titleabbrev>Random\RandomError</titleabbrev>
@@ -18,29 +18,33 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Random\RandomError</exceptionname>
-    </ooexception>
+   <packagesynopsis>
+    <package>Random</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Error</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooexception>
+      <exceptionname>RandomError</exceptionname>
+     </ooexception>
 
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>Error</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
+      <xi:fallback/>
+     </xi:include>
+
+     <classsynopsisinfo role="comment">&InheritedMethods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.error')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Error'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.randomexception.xml b/reference/random/random.randomexception.xml
index 9512b7912..f452f5802 100644
--- a/reference/random/random.randomexception.xml
+++ b/reference/random/random.randomexception.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-randomexception" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\RandomException</title>
  <titleabbrev>Random\RandomException</titleabbrev>
@@ -18,29 +18,33 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooexception>
-     <exceptionname>Random\RandomException</exceptionname>
-    </ooexception>
+   <packagesynopsis>
+    <package>Random</package>
 
-    <ooclass>
-     <modifier>extends</modifier>
-     <classname>Exception</classname>
-    </ooclass>
+    <classsynopsis class="class">
+     <ooexception>
+      <exceptionname>RandomException</exceptionname>
+     </ooexception>
 
-    <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
-     <xi:fallback/>
-    </xi:include>
+     <ooclass>
+      <modifier>extends</modifier>
+      <classname>Exception</classname>
+     </ooclass>
 
-    <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:constructorsynopsis[@role='Exception'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&InheritedProperties;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:partintro/db:section/db:classsynopsis/db:fieldsynopsis[preceding-sibling::db:classsynopsisinfo[1][@role='comment' and text()='&Properties;']]))">
+      <xi:fallback/>
+     </xi:include>
+
+     <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:constructorsynopsis[@role='Exception'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.exception')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Exception'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/random/random.randomizer.xml b/reference/random/random.randomizer.xml
index 501fe7337..31145c8ce 100644
--- a/reference/random/random.randomizer.xml
+++ b/reference/random/random.randomizer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
+<?xml version="1.0" encoding="utf-8"?><!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: fernandowobeto Status: ready --><!-- CREDITS: fernandowobeto -->
 <reference xml:id="class.random-randomizer" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>A classe Random\Randomizer</title>
  <titleabbrev>Random\Randomizer</titleabbrev>
@@ -18,28 +18,32 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="class">
-    <ooclass>
-     <modifier>final</modifier>
-     <classname>Random\Randomizer</classname>
-    </ooclass>
+   <packagesynopsis>
+    <package>Random</package>
 
-    <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
-    <fieldsynopsis>
-     <modifier>public</modifier>
-     <modifier>readonly</modifier>
-     <type>Random\Engine</type>
-     <varname linkend="random-randomizer.props.engine">engine</varname>
-    </fieldsynopsis>
+    <classsynopsis class="class">
+     <ooclass>
+      <modifier>final</modifier>
+      <classname>Randomizer</classname>
+     </ooclass>
 
-    <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-randomizer')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Randomizer'])">
-     <xi:fallback/>
-    </xi:include>
-    <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-randomizer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Randomizer'])">
-     <xi:fallback/>
-    </xi:include>
-   </classsynopsis>
+     <classsynopsisinfo role="comment">&Properties;</classsynopsisinfo>
+     <fieldsynopsis>
+      <modifier>public</modifier>
+      <modifier>readonly</modifier>
+      <type>Random\Engine</type>
+      <varname linkend="random-randomizer.props.engine">engine</varname>
+     </fieldsynopsis>
+
+     <classsynopsisinfo role="comment">&Methods;</classsynopsisinfo>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-randomizer')/db:refentry/db:refsect1[@role='description']/descendant::db:constructorsynopsis[@role='Random\\Randomizer'])">
+      <xi:fallback/>
+     </xi:include>
+     <xi:include xpointer="xmlns(db=http://docbook.org/ns/docbook) xpointer(id('class.random-randomizer')/db:refentry/db:refsect1[@role='description']/descendant::db:methodsynopsis[@role='Random\\Randomizer'])">
+      <xi:fallback/>
+     </xi:include>
+    </classsynopsis>
+   </packagesynopsis>
 <!-- }}} -->
 
   </section>
diff --git a/reference/stream/streambucket.xml b/reference/stream/streambucket.xml
index 6ea0524a6..c1beceb9e 100644
--- a/reference/stream/streambucket.xml
+++ b/reference/stream/streambucket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 32caa89e81d180f209425159e2be2f243a3e12cc Maintainer: leonardolara Status: ready -->
+<!-- EN-Revision: a7be7e9abb82bfd0c69ea341d74fb9456e93f6f6 Maintainer: leonardolara Status: ready -->
 <reference xml:id="class.streambucket" role="class" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
 
  <title>A classe StreamBucket</title>
@@ -57,28 +57,28 @@
     <varlistentry xml:id="streambucket.props.bucket">
      <term>resource <varname>bucket</varname></term>
      <listitem>
-      <simparapara>Um recurso <literal>userfilter.bucket</literal>.</simparapara>
+      <simpara>Um recurso <literal>userfilter.bucket</literal>.</simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="streambucket.props.data">
      <term>string <varname>data</varname></term>
      <listitem>
-      <simparapara>A string atual no bucket.</simparapara>
+      <simpara>A string atual no bucket.</simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="streambucket.props.datalen">
      <term>int <varname>datalen</varname></term>
      <listitem>
-      <simparapara>
+      <simpara>
        O comprimento da string no bucket.
        Descontinuado a partir do PHP 8.4 em favor de <literal>StreamBucket::$dataLength</literal>.
-      </simparapara>
+      </simpara>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="streambucket.props.dataLength">
      <term>int <varname>dataLength</varname></term>
      <listitem>
-      <simparapara>O comprimento da string no bucket.</simparapara>
+      <simpara>O comprimento da string no bucket.</simpara>
      </listitem>
     </varlistentry>
    </variablelist>