diff --git a/language/predefined/argumentcounterror.xml b/language/predefined/argumentcounterror.xml
index 0093bc68..08d295d4 100644
--- a/language/predefined/argumentcounterror.xml
+++ b/language/predefined/argumentcounterror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.argumentcounterror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.argumentcounterror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>ArgumentCountError</title>
  <titleabbrev>ArgumentCountError</titleabbrev>
  
@@ -53,7 +53,7 @@
  
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/arithmeticerror.xml b/language/predefined/arithmeticerror.xml
index e5adbb85..0970dd52 100644
--- a/language/predefined/arithmeticerror.xml
+++ b/language/predefined/arithmeticerror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.arithmeticerror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.arithmeticerror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>ArithmeticError</title>
  <titleabbrev>ArithmeticError</titleabbrev>
  
@@ -52,7 +52,7 @@
  
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/arrayaccess.xml b/language/predefined/arrayaccess.xml
index 770b7185..2b30082f 100644
--- a/language/predefined/arrayaccess.xml
+++ b/language/predefined/arrayaccess.xml
@@ -2,7 +2,7 @@
 <!-- EN-Revision: f94d903985119d3ac00f4528551df947f57b667f Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
 
-<phpdoc:classref xml:id="class.arrayaccess" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.arrayaccess" 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>Interfejs ArrayAccess</title>
  <titleabbrev>ArrayAccess</titleabbrev>
@@ -118,7 +118,7 @@ obj Object
  &language.predefined.arrayaccess.offsetset;
  &language.predefined.arrayaccess.offsetunset;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/assertionerror.xml b/language/predefined/assertionerror.xml
index 61fd7c54..cb6ffa0d 100644
--- a/language/predefined/assertionerror.xml
+++ b/language/predefined/assertionerror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.assertionerror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.assertionerror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>AssertionError</title>
  <titleabbrev>AssertionError</titleabbrev>
  
@@ -49,7 +49,7 @@
  
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/attributes/allowdynamicproperties.xml b/language/predefined/attributes/allowdynamicproperties.xml
index 3a3ec401..9bc0136d 100644
--- a/language/predefined/attributes/allowdynamicproperties.xml
+++ b/language/predefined/attributes/allowdynamicproperties.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: f94d903985119d3ac00f4528551df947f57b667f Maintainer: sobak Status: ready -->
-<phpdoc:classref xml:id="class.allowdynamicproperties" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.allowdynamicproperties" 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>Klasa AllowDynamicProperties</title>
  <titleabbrev>AllowDynamicProperties</titleabbrev>
 
@@ -73,7 +73,7 @@ Deprecated: Creation of dynamic property DomyslneZachowanie::$nieistniejacaWlasc
 
  &language.predefined.allowdynamicproperties.construct;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/attributes/attribute.xml b/language/predefined/attributes/attribute.xml
index 2eb958c8..96fb7c11 100644
--- a/language/predefined/attributes/attribute.xml
+++ b/language/predefined/attributes/attribute.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
-<phpdoc:classref xml:id="class.attribute" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.attribute" 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>Klasa Attribute</title>
  <titleabbrev>Attribute</titleabbrev>
 
@@ -165,7 +165,7 @@
 
  &language.predefined.attribute.construct;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/attributes/override.xml b/language/predefined/attributes/override.xml
index 960b2942..866f8671 100644
--- a/language/predefined/attributes/override.xml
+++ b/language/predefined/attributes/override.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: f94d903985119d3ac00f4528551df947f57b667f Maintainer: sobak Status: ready -->
-<phpdoc:classref xml:id="class.override" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.override" 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>Klasa Override</title>
  <titleabbrev>Override</titleabbrev>
 
@@ -70,7 +70,7 @@ Fatal error: Extended::boo() has #[\Override] attribute, but no matching parent
 
  &language.predefined.attributes.override.construct;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/attributes/returntypewillchange.xml b/language/predefined/attributes/returntypewillchange.xml
index e1b30708..ca0a36f9 100644
--- a/language/predefined/attributes/returntypewillchange.xml
+++ b/language/predefined/attributes/returntypewillchange.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
-<phpdoc:classref xml:id="class.returntypewillchange" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.returntypewillchange" 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>Klasa ReturnTypeWillChange</title>
  <titleabbrev>ReturnTypeWillChange</titleabbrev>
 
@@ -45,7 +45,7 @@
 
  &language.predefined.returntypewillchange.construct;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/attributes/sensitiveparameter.xml b/language/predefined/attributes/sensitiveparameter.xml
index b0a82386..4f66a6bf 100644
--- a/language/predefined/attributes/sensitiveparameter.xml
+++ b/language/predefined/attributes/sensitiveparameter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: f94d903985119d3ac00f4528551df947f57b667f Maintainer: sobak Status: ready -->
-<phpdoc:classref xml:id="class.sensitiveparameter" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.sensitiveparameter" 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>Klasa SensitiveParameter</title>
  <titleabbrev>SensitiveParameter</titleabbrev>
 
@@ -102,7 +102,7 @@ Stack trace:
 
  &language.predefined.sensitiveparameter.construct;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/compileerror.xml b/language/predefined/compileerror.xml
index d588f4f4..97b9f088 100644
--- a/language/predefined/compileerror.xml
+++ b/language/predefined/compileerror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.compileerror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.compileerror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>CompileError</title>
  <titleabbrev>CompileError</titleabbrev>
 
@@ -49,7 +49,7 @@
 
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/divisionbyzeroerror.xml b/language/predefined/divisionbyzeroerror.xml
index b7a52468..4ea2eda8 100644
--- a/language/predefined/divisionbyzeroerror.xml
+++ b/language/predefined/divisionbyzeroerror.xml
@@ -2,7 +2,7 @@
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
 
-<phpdoc:exceptionref xml:id="class.divisionbyzeroerror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.divisionbyzeroerror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>DivisionByZeroError</title>
  <titleabbrev>DivisionByZeroError</titleabbrev>
  
@@ -50,7 +50,7 @@
  
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/error.xml b/language/predefined/error.xml
index 44a174f3..d8bcfd85 100644
--- a/language/predefined/error.xml
+++ b/language/predefined/error.xml
@@ -2,7 +2,7 @@
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
 
-<phpdoc:classref xml:id="class.error" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.error" 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>Error</title>
  <titleabbrev>Error</titleabbrev>
  
@@ -148,7 +148,7 @@
 &language.predefined.error.gettraceasstring;
 &language.predefined.error.tostring;
 &language.predefined.error.clone;
-</phpdoc:classref>
+</reference>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/errorexception.xml b/language/predefined/errorexception.xml
index 4808e361..85cd11e8 100644
--- a/language/predefined/errorexception.xml
+++ b/language/predefined/errorexception.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: e6376e04ed2526138e5b71e16168cf6bb269fa8a Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.errorexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.errorexception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>ErrorException</title>
  <titleabbrev>ErrorException</titleabbrev>
  
@@ -118,7 +118,7 @@ Stack trace:
  &language.predefined.errorexception.construct;
  &language.predefined.errorexception.getseverity;
  
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/exception.xml b/language/predefined/exception.xml
index 0a03c5cc..ef4e02bc 100644
--- a/language/predefined/exception.xml
+++ b/language/predefined/exception.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.exception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.exception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Exception</title>
  <titleabbrev>Exception</titleabbrev>
  
@@ -149,7 +149,7 @@
  &language.predefined.exception.tostring;
  &language.predefined.exception.clone;
  
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/parseerror.xml b/language/predefined/parseerror.xml
index 88ea9b20..871ed806 100644
--- a/language/predefined/parseerror.xml
+++ b/language/predefined/parseerror.xml
@@ -2,7 +2,7 @@
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
 
-<phpdoc:exceptionref xml:id="class.parseerror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.parseerror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>ParseError</title>
  <titleabbrev>ParseError</titleabbrev>
  
@@ -57,7 +57,7 @@
  
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/sensitiveparametervalue.xml b/language/predefined/sensitiveparametervalue.xml
index f105cf04..84205a47 100644
--- a/language/predefined/sensitiveparametervalue.xml
+++ b/language/predefined/sensitiveparametervalue.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
-<phpdoc:classref xml:id="class.sensitiveparametervalue" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.sensitiveparametervalue" 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>Klasa SensitiveParameterValue</title>
  <titleabbrev>SensitiveParameterValue</titleabbrev>
 
@@ -73,7 +73,7 @@
  &language.predefined.sensitiveparametervalue.debuginfo;
  &language.predefined.sensitiveparametervalue.getvalue;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/serializable.xml b/language/predefined/serializable.xml
index f12598df..ba16f043 100644
--- a/language/predefined/serializable.xml
+++ b/language/predefined/serializable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: f94d903985119d3ac00f4528551df947f57b667f Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.serializable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.serializable" 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>Interfejs Serializable</title>
  <titleabbrev>Serializable</titleabbrev>
@@ -102,7 +102,7 @@ string(18) "Moje prywatne dane"
  &language.predefined.serializable.serialize;
  &language.predefined.serializable.unserialize;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/stringable.xml b/language/predefined/stringable.xml
index 2fd345f4..67436a0c 100644
--- a/language/predefined/stringable.xml
+++ b/language/predefined/stringable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 9eb4a46bba05da229be4c8f7a3cb64702e1a2f95 Maintainer: cyb0org Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.stringable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.stringable" 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>Interfejs Stringable</title>
  <titleabbrev>Stringable</titleabbrev>
@@ -95,7 +95,7 @@ showStuff($ip);
  </partintro>
 
  &language.predefined.stringable.tostring;
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/throwable.xml b/language/predefined/throwable.xml
index 754d6f2f..4bc08292 100644
--- a/language/predefined/throwable.xml
+++ b/language/predefined/throwable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 09caff9ea664f7154a7d37e92b2c332c28462404 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.throwable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.throwable" 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>Throwable</title>
  <titleabbrev>Throwable</titleabbrev>
@@ -87,7 +87,7 @@
  &language.predefined.throwable.gettraceasstring;
  &language.predefined.throwable.getprevious;
  &language.predefined.throwable.tostring;
-</phpdoc:classref>
+</reference>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/language/predefined/typeerror.xml b/language/predefined/typeerror.xml
index 2ee09d89..89aa3343 100644
--- a/language/predefined/typeerror.xml
+++ b/language/predefined/typeerror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.typeerror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.typeerror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>TypeError</title>
  <titleabbrev>TypeError</titleabbrev>
  
@@ -96,7 +96,7 @@
   </section>
 
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/unhandledmatcherror.xml b/language/predefined/unhandledmatcherror.xml
index 00b162e1..90df1309 100644
--- a/language/predefined/unhandledmatcherror.xml
+++ b/language/predefined/unhandledmatcherror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.unhandledmatcherror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.unhandledmatcherror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>UnhandledMatchError</title>
  <titleabbrev>UnhandledMatchError</titleabbrev>
 
@@ -50,7 +50,7 @@
 
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/language/predefined/valueerror.xml b/language/predefined/valueerror.xml
index 94b251da..7c52164f 100644
--- a/language/predefined/valueerror.xml
+++ b/language/predefined/valueerror.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.valueerror" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.valueerror" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>ValueError</title>
  <titleabbrev>ValueError</titleabbrev>
 
@@ -50,7 +50,7 @@
 <!-- }}} -->
   </section>
  </partintro>
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/curl/curlfile.xml b/reference/curl/curlfile.xml
index 5ca912a8..c68e8fcc 100644
--- a/reference/curl/curlfile.xml
+++ b/reference/curl/curlfile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 4731f1a2d216c527410022765b0ef1a731f02695 Maintainer: sobak Status: ready -->
 
-<phpdoc:classref xml:id="class.curlfile" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.curlfile" 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>Klasa CURLFile</title>
  <titleabbrev>CURLFile</titleabbrev>
@@ -97,7 +97,7 @@
 
  &reference.curl.entities.curlfile;
 
-</phpdoc:classref>
+</reference>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/dir/directory.xml b/reference/dir/directory.xml
index e4015991..bd7b711b 100644
--- a/reference/dir/directory.xml
+++ b/reference/dir/directory.xml
@@ -2,7 +2,7 @@
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
 
-<phpdoc:classref xml:id="class.directory" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.directory" 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>Klasa Directory</title>
  <titleabbrev>Directory</titleabbrev>
@@ -104,7 +104,7 @@
 
  &reference.dir.entities.directory;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/json/jsonexception.xml b/reference/json/jsonexception.xml
index 92ee0b36..ae1154bd 100644
--- a/reference/json/jsonexception.xml
+++ b/reference/json/jsonexception.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:exceptionref xml:id="class.jsonexception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.jsonexception" role="exception" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>The JsonException class</title>
  <titleabbrev>JsonException</titleabbrev>
  
@@ -56,7 +56,7 @@
  &reference.extname.entities.classname;
  -->
  
-</phpdoc:exceptionref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/json/jsonserializable.xml b/reference/json/jsonserializable.xml
index 9ed0d9e0..57243435 100644
--- a/reference/json/jsonserializable.xml
+++ b/reference/json/jsonserializable.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 9eb4a46bba05da229be4c8f7a3cb64702e1a2f95 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.jsonserializable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.jsonserializable" 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>Interfejs JsonSerializable</title>
  <titleabbrev>JsonSerializable</titleabbrev>
@@ -41,7 +41,7 @@
 
  &reference.json.entities.jsonserializable;
 
-</phpdoc:classref>
+</reference>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/mysqli/mysqli.xml b/reference/mysqli/mysqli.xml
index 11b81242..623206da 100644
--- a/reference/mysqli/mysqli.xml
+++ b/reference/mysqli/mysqli.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mysqli" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.mysqli" 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>Klasa mysqli</title>
  <titleabbrev>mysqli</titleabbrev>
  
@@ -151,7 +151,7 @@
  
  &reference.mysqli.entities.mysqli;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/mysqli/mysqli_driver.xml b/reference/mysqli/mysqli_driver.xml
index 49b4acb0..3a890a51 100644
--- a/reference/mysqli/mysqli_driver.xml
+++ b/reference/mysqli/mysqli_driver.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mysqli-driver" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.mysqli-driver" 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>Klasa mysqli_driver</title>
  <titleabbrev>mysqli_driver</titleabbrev>
  
@@ -162,7 +162,7 @@
  
  &reference.mysqli.entities.mysqli-driver;
 
-</phpdoc:classref>
+</reference>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/mysqli/mysqli_result.xml b/reference/mysqli/mysqli_result.xml
index d62722f6..6ff6820d 100644
--- a/reference/mysqli/mysqli_result.xml
+++ b/reference/mysqli/mysqli_result.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xml:id="class.mysqli-result" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.mysqli-result" 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>Klasa mysqli_result</title>
  <titleabbrev>mysqli_result</titleabbrev>
  
@@ -118,7 +118,7 @@
 
  &reference.mysqli.entities.mysqli-result;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/mysqli/mysqli_sql_exception.xml b/reference/mysqli/mysqli_sql_exception.xml
index 6bb4ac8f..7619da3a 100644
--- a/reference/mysqli/mysqli_sql_exception.xml
+++ b/reference/mysqli/mysqli_sql_exception.xml
@@ -2,7 +2,7 @@
 <!-- EN-Revision: 38e65393c58b006a923c5bb7878aee5c73e21b20 Maintainer: sobak Status: ready -->
 <!-- $Revision$ --> 
 
-<phpdoc:classref xml:id="class.mysqli-sql-exception" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.mysqli-sql-exception" 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>Klasa mysqli_sql_exception</title>
  <titleabbrev>mysqli_sql_exception</titleabbrev>
@@ -58,7 +58,7 @@
 
  </partintro>
 
-</phpdoc:classref>
+</reference>
 
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/mysqli/mysqli_stmt.xml b/reference/mysqli/mysqli_stmt.xml
index ae7471ef..61941e5a 100644
--- a/reference/mysqli/mysqli_stmt.xml
+++ b/reference/mysqli/mysqli_stmt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- EN-Revision: 372dfed158ca2fdd1373f0543cd5b895bb81ede9 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
-<phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.mysqli-stmt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference role="class" xml:id="class.mysqli-stmt" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
  <title>Klasa mysqli_stmt</title>
  <titleabbrev>mysqli_stmt</titleabbrev>
  
@@ -45,7 +45,7 @@
  
  &reference.mysqli.entities.mysqli-stmt;
 
-</phpdoc:classref>
+</reference>
  
 <!-- Keep this comment at the end of the file
 Local variables:
diff --git a/reference/mysqli/mysqli_warning.xml b/reference/mysqli/mysqli_warning.xml
index 8a66a071..76f5c1d9 100644
--- a/reference/mysqli/mysqli_warning.xml
+++ b/reference/mysqli/mysqli_warning.xml
@@ -2,7 +2,7 @@
 <!-- EN-Revision: 14767af0f05dffa6fdb9b49e1a1f4e9ca7022a60 Maintainer: sobak Status: ready -->
 <!-- $Revision$ -->
 <!-- CREDITS: cyb0org -->
-<phpdoc:classref xml:id="class.mysqli-warning" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude">
+<reference xml:id="class.mysqli-warning" 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>Klasa mysqli_warning</title>
  <titleabbrev>mysqli_warning</titleabbrev>
  
@@ -88,7 +88,7 @@
 
  &reference.mysqli.entities.mysqli-warning;
 
-</phpdoc:classref>
+</reference>
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml