diff --git a/language/predefined/backedenum.xml b/language/predefined/backedenum.xml
index 7fd4ff4c52d5..b94d6defb37e 100644
--- a/language/predefined/backedenum.xml
+++ b/language/predefined/backedenum.xml
@@ -27,9 +27,7 @@
     </ooclass>
 
     <classsynopsisinfo>
-     <oointerface>
-      <interfacename>BackedEnum</interfacename>
-     </oointerface>
+     <ooclass><classname>BackedEnum</classname></ooclass>
 
      <oointerface>
       <interfacename>UnitEnum</interfacename>
diff --git a/language/predefined/iterator.xml b/language/predefined/iterator.xml
index cade00dc31d9..1f607df2a1d9 100644
--- a/language/predefined/iterator.xml
+++ b/language/predefined/iterator.xml
@@ -27,9 +27,7 @@
     </ooclass>
 
     <classsynopsisinfo>
-     <oointerface>
-      <interfacename>Iterator</interfacename>
-     </oointerface>
+     <ooclass><classname>Iterator</classname></ooclass>
 
      <oointerface>
       <interfacename>Traversable</interfacename>
diff --git a/language/predefined/iteratoraggregate.xml b/language/predefined/iteratoraggregate.xml
index 10e926e0f276..361d91894f9e 100644
--- a/language/predefined/iteratoraggregate.xml
+++ b/language/predefined/iteratoraggregate.xml
@@ -26,9 +26,7 @@
     </ooclass>
 
     <classsynopsisinfo>
-     <oointerface>
-      <interfacename>IteratorAggregate</interfacename>
-     </oointerface>
+     <ooclass><classname>IteratorAggregate</classname></ooclass>
 
      <oointerface>
       <interfacename>Traversable</interfacename>
diff --git a/language/predefined/throwable.xml b/language/predefined/throwable.xml
index 76a97db953dc..9d63cf9e1cdb 100644
--- a/language/predefined/throwable.xml
+++ b/language/predefined/throwable.xml
@@ -35,9 +35,7 @@
     </ooclass>
 
     <classsynopsisinfo>
-     <oointerface>
-      <interfacename>Throwable</interfacename>
-     </oointerface>
+     <ooclass><classname>Throwable</classname></ooclass>
 
      <oointerface>
       <interfacename>Stringable</interfacename>
diff --git a/reference/cmark/commonmark.interfaces.ivisitable.xml b/reference/cmark/commonmark.interfaces.ivisitable.xml
index b58eda46a88d..3c862d081f28 100644
--- a/reference/cmark/commonmark.interfaces.ivisitable.xml
+++ b/reference/cmark/commonmark.interfaces.ivisitable.xml
@@ -21,7 +21,7 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis>
+   <classsynopsis class="interface">
     <ooclass><classname>CommonMark\Interfaces\IVisitable</classname></ooclass>
 
 <!-- {{{ Class synopsis -->
diff --git a/reference/cmark/commonmark.interfaces.ivisitor.xml b/reference/cmark/commonmark.interfaces.ivisitor.xml
index ee6c12c2e2f3..f0dc1fca6212 100644
--- a/reference/cmark/commonmark.interfaces.ivisitor.xml
+++ b/reference/cmark/commonmark.interfaces.ivisitor.xml
@@ -21,7 +21,7 @@
    &reftitle.classsynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis>
+   <classsynopsis class="interface">
     <ooclass><classname>CommonMark\Interfaces\IVisitor</classname></ooclass>
 
 <!-- {{{ Class synopsis -->
diff --git a/reference/cmark/commonmark/interfaces/ivisitable/accept.xml b/reference/cmark/commonmark/interfaces/ivisitable/accept.xml
index 1f725727e791..c86fcc40b898 100644
--- a/reference/cmark/commonmark/interfaces/ivisitable/accept.xml
+++ b/reference/cmark/commonmark/interfaces/ivisitable/accept.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type>void</type><methodname>CommonMark\Interfaces\IVisitable::accept</methodname>
+   <modifier>public</modifier> <type>void</type><methodname>CommonMark\Interfaces\IVisitable::accept</methodname>
    <methodparam><type>CommonMark\Interfaces\IVisitor</type><parameter>visitor</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/cmark/commonmark/interfaces/ivisitor/enter.xml b/reference/cmark/commonmark/interfaces/ivisitor/enter.xml
index a5be5c690e04..b143c88eeaf0 100644
--- a/reference/cmark/commonmark/interfaces/ivisitor/enter.xml
+++ b/reference/cmark/commonmark/interfaces/ivisitor/enter.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>IVisitable</type><type>null</type></type><methodname>CommonMark\Interfaces\IVisitor::enter</methodname>
+   <modifier>public</modifier> <type class="union"><type>int</type><type>IVisitable</type><type>null</type></type><methodname>CommonMark\Interfaces\IVisitor::enter</methodname>
    <methodparam><type>IVisitable</type><parameter>visitable</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/cmark/commonmark/interfaces/ivisitor/leave.xml b/reference/cmark/commonmark/interfaces/ivisitor/leave.xml
index 7f90f085439f..a50bbbd68784 100644
--- a/reference/cmark/commonmark/interfaces/ivisitor/leave.xml
+++ b/reference/cmark/commonmark/interfaces/ivisitor/leave.xml
@@ -10,7 +10,7 @@
  <refsect1 role="description">
   &reftitle.description;
   <methodsynopsis>
-   <modifier>abstract</modifier> <modifier>public</modifier> <type class="union"><type>int</type><type>IVisitable</type><type>null</type></type><methodname>CommonMark\Interfaces\IVisitor::leave</methodname>
+   <modifier>public</modifier> <type class="union"><type>int</type><type>IVisitable</type><type>null</type></type><methodname>CommonMark\Interfaces\IVisitor::leave</methodname>
    <methodparam><type>IVisitable</type><parameter>visitable</parameter></methodparam>
   </methodsynopsis>
 
diff --git a/reference/json/jsonserializable.xml b/reference/json/jsonserializable.xml
index 0f1ee38e3d2f..3252cb52f3a4 100644
--- a/reference/json/jsonserializable.xml
+++ b/reference/json/jsonserializable.xml
@@ -22,7 +22,7 @@
    &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis>
+   <classsynopsis class="interface">
     <ooclass>
      <classname>JsonSerializable</classname>
     </ooclass>
diff --git a/reference/pthreads/collectable.xml b/reference/pthreads/collectable.xml
index 30ec76d4a969..bc1e54e75459 100644
--- a/reference/pthreads/collectable.xml
+++ b/reference/pthreads/collectable.xml
@@ -21,7 +21,7 @@
    &reftitle.interfacesynopsis;
 
 <!-- {{{ Synopsis -->
-   <classsynopsis>
+   <classsynopsis class="interface">
     <ooclass><classname>Collectable</classname></ooclass>
 
 <!-- {{{ Class synopsis -->