diff --git a/language/control-structures/declare.xml b/language/control-structures/declare.xml
index 67ad745610..c7aaeeaa2e 100644
--- a/language/control-structures/declare.xml
+++ b/language/control-structures/declare.xml
@@ -30,8 +30,8 @@ declare (directive)
   directive), the <literal>encoding</literal> directive (See below for more
   information on the
   <link linkend="control-structures.declare.encoding">encoding</link>
-  directive) and the <literal>strict_types</literal> directive (See for more 
-  information the 
+  directive) and the <literal>strict_types</literal> directive (See for more
+  information the
   <link linkend="functions.arguments.type-declaration.strict">strict</link>
   section on the Function arguments page)
  </para>
@@ -47,11 +47,11 @@ declare (directive)
         <tbody>
          <row>
           <entry>5.3.0</entry>
-          <entry>Added encoding directive</entry>
+          <entry>Added <literal>encoding</literal> directive</entry>
          </row>
          <row>
           <entry>7.0.0</entry>
-          <entry>Added strict_types directive</entry>
+          <entry>Added <literal>strict_types</literal> directive</entry>
          </row>
         </tbody>
        </tgroup>
@@ -220,7 +220,7 @@ declare(encoding='ISO-8859-1');
    <literal>--enable-zend-multibyte</literal>.
   </para>
   <para>
-   Note that PHP does not expose whether <literal>--enable-zend-multibyte</literal> was 
+   Note that PHP does not expose whether <literal>--enable-zend-multibyte</literal> was
    used to compile PHP other than by <function>phpinfo</function>.
   </para>
   <para>
diff --git a/language/predefined/traversable.xml b/language/predefined/traversable.xml
index 7797b8ce33..39224a7eaa 100644
--- a/language/predefined/traversable.xml
+++ b/language/predefined/traversable.xml
@@ -3,7 +3,7 @@
 
 <phpdoc:classref xml:id="class.traversable" 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">
 
- <title>The Traversable interface</title>
+ <title>The <interfacename>Traversable</interfacename> interface</title>
  <titleabbrev>Traversable</titleabbrev>
 
  <partintro>
@@ -16,25 +16,25 @@
    </para>
    <para>
     Abstract base interface that cannot be implemented alone. Instead it must
-    be implemented by either <classname>IteratorAggregate</classname> or
-    <classname>Iterator</classname>.
+    be implemented by either <interfacename>IteratorAggregate</interfacename> or
+    <interfacename>Iterator</interfacename>.
    </para>
    <note>
     <para>
      Internal (built-in) classes that implement this interface can be used in
      a &foreach; construct and do not need to implement
-     <classname>IteratorAggregate</classname> or
-     <classname>Iterator</classname>.
+     <interfacename>IteratorAggregate</interfacename> or
+     <interfacename>Iterator</interfacename>.
     </para>
    </note>
    <note>
     <para>
      This is an internal engine interface which cannot be implemented in PHP
-     scripts. Either <classname>IteratorAggregate</classname> or
-     <classname>Iterator</classname> must be used instead.
+     scripts. Either <interfacename>IteratorAggregate</interfacename> or
+     <interfacename>Iterator</interfacename> must be used instead.
       When implementing an interface which extends Traversable, make sure to
-      list <classname>IteratorAggregate</classname> or 
-      <classname>Iterator</classname> before its name in the implements
+      list <interfacename>IteratorAggregate</interfacename> or
+      <interfacename>Iterator</interfacename> before its name in the implements
       clause.
     </para>
    </note>