diff --git a/reference/random/random.brokenrandomengineerror.xml b/reference/random/random.brokenrandomengineerror.xml
index 7dae47a22f..d79e871da2 100644
--- a/reference/random/random.brokenrandomengineerror.xml
+++ b/reference/random/random.brokenrandomengineerror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\BrokenRandomEngineError クラス</title>
  <titleabbrev>Random\BrokenRandomEngineError</titleabbrev>
@@ -21,29 +21,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 483403c06b..3ec5739b6b 100644
--- a/reference/random/random.cryptosafeengine.xml
+++ b/reference/random/random.cryptosafeengine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9eb4a46bba05da229be4c8f7a3cb64702e1a2f95 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\CryptoSafeEngine インターフェイス</title>
  <titleabbrev>Random\CryptoSafeEngine</titleabbrev>
@@ -21,21 +21,25 @@
    &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis class="interface">
-    <oointerface>
-     <interfacename>Random\CryptoSafeEngine</interfacename>
-    </oointerface>
+   <packagesynopsis>
+    <package>Random</package>
 
-    <oointerface>
-     <modifier>extends</modifier>
-     <interfacename>Random\Engine</interfacename>
-    </oointerface>
+    <classsynopsis class="interface">
+     <oointerface>
+      <interfacename>CryptoSafeEngine</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>
+     <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 32932b26e0..bdc9130d1f 100644
--- a/reference/random/random.engine.mt19937.xml
+++ b/reference/random/random.engine.mt19937.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\Engine\Mt19937 クラス</title>
  <titleabbrev>Random\Engine\Mt19937</titleabbrev>
@@ -20,25 +20,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 ce14f3ae96..94c1a1670c 100644
--- a/reference/random/random.engine.pcgoneseq128xslrr64.xml
+++ b/reference/random/random.engine.pcgoneseq128xslrr64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\Engine\PcgOneseq128XslRr64 クラス</title>
  <titleabbrev>Random\Engine\PcgOneseq128XslRr64</titleabbrev>
@@ -21,25 +21,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 8f38a462c8..8728203b9e 100644
--- a/reference/random/random.engine.secure.xml
+++ b/reference/random/random.engine.secure.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\Engine\Secure クラス</title>
  <titleabbrev>Random\Engine\Secure</titleabbrev>
@@ -30,22 +30,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 6987238d05..62a148beac 100644
--- a/reference/random/random.engine.xml
+++ b/reference/random/random.engine.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 9eb4a46bba05da229be4c8f7a3cb64702e1a2f95 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\Engine インターフェイス</title>
  <titleabbrev>Random\Engine</titleabbrev>
@@ -43,16 +43,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 42cb90f142..1c63b5be00 100644
--- a/reference/random/random.engine.xoshiro256starstar.xml
+++ b/reference/random/random.engine.xoshiro256starstar.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\Engine\Xoshiro256StarStar クラス</title>
  <titleabbrev>Random\Engine\Xoshiro256StarStar</titleabbrev>
@@ -20,25 +20,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 5485d97d69..a2d7570767 100644
--- a/reference/random/random.randomerror.xml
+++ b/reference/random/random.randomerror.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\RandomError クラス</title>
  <titleabbrev>Random\RandomError</titleabbrev>
@@ -20,29 +20,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 8cf36ef531..1ffce64f0f 100644
--- a/reference/random/random.randomexception.xml
+++ b/reference/random/random.randomexception.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\RandomException クラス</title>
  <titleabbrev>Random\RandomException</titleabbrev>
@@ -20,29 +20,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 412b657f62..690871f979 100644
--- a/reference/random/random.randomizer.xml
+++ b/reference/random/random.randomizer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- $Revision$ -->
-<!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: mumumu Status: ready -->
+<!-- EN-Revision: c8e3b2ccadcf79d3c9d53c532ca02572b02f741d Maintainer: mumumu Status: ready -->
 <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>Random\Randomizer クラス</title>
  <titleabbrev>Random\Randomizer</titleabbrev>
@@ -21,28 +21,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>