diff --git a/appendices/migration54.xml b/appendices/migration54.xml
index d380e64582..4893f84edf 100644
--- a/appendices/migration54.xml
+++ b/appendices/migration54.xml
@@ -294,7 +294,7 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     Added CLI option --rz which shows information of the named Zend extension.
+     Added CLI option <literal>--rz</literal> which shows information of the named Zend extension.
     </simpara>
    </listitem>
    <listitem>
@@ -557,41 +557,41 @@
   <simpara>
    Several new methods were introduced in 5.4.0:
   </simpara>
-  <simpara><classname>XSL</classname>:</simpara>
+  <simpara><link linkend="book.xsl">XSL</link>:</simpara>
   <itemizedlist>
    <listitem>
     <simpara>
-     <function>XsltProcessor::setSecurityPrefs</function> and
-     <function>XsltProcessor::getSecurityPrefs</function>
+     <methodname>XsltProcessor::setSecurityPrefs</methodname> and
+     <methodname>XsltProcessor::getSecurityPrefs</methodname>
     </simpara>
    </listitem>
   </itemizedlist>
-  <simpara><classname>SPL</classname>:</simpara>
+  <simpara><link linkend="book.spl">SPL</link>:</simpara>
   <itemizedlist>
    <listitem>
     <simpara>
-     <function>RegexIterator::getRegex</function>
-     <function>SplObjectStorage::getHash</function>
-     <function>DirectoryIterator::getExtension</function>
-     <function>SplDoublyLinkedList::serialize</function>
-     <function>SplDoublyLinkedList::unserialize</function>
-     <function>SplFileInfo::getExtension</function>
-     <function>SplFileObject::fputcsv</function>
-     <function>SplQueue::serialize</function>
-     <function>SplQueue::unserialize</function>
-     <function>SplStack::serialize</function>
-     <function>SplStack::unserialize</function>
-     <function>SplTempFileObject::fputcsv</function>
+     <methodname>RegexIterator::getRegex</methodname>
+     <methodname>SplObjectStorage::getHash</methodname>
+     <methodname>DirectoryIterator::getExtension</methodname>
+     <methodname>SplDoublyLinkedList::serialize</methodname>
+     <methodname>SplDoublyLinkedList::unserialize</methodname>
+     <methodname>SplFileInfo::getExtension</methodname>
+     <methodname>SplFileObject::fputcsv</methodname>
+     <methodname>SplQueue::serialize</methodname>
+     <methodname>SplQueue::unserialize</methodname>
+     <methodname>SplStack::serialize</methodname>
+     <methodname>SplStack::unserialize</methodname>
+     <methodname>SplTempFileObject::fputcsv</methodname>
     </simpara>
    </listitem>
   </itemizedlist>
-  <simpara><classname>Reflection</classname>:</simpara>
+  <simpara><link linkend="book.reflection">Reflection</link>:</simpara>
   <itemizedlist>
    <listitem>
     <simpara>
-     <function>ReflectionExtension::isPersistent</function>
-     <function>ReflectionExtension::isTemporary</function>
-     <function>ReflectionClass::isCloneable</function>
+     <methodname>ReflectionExtension::isPersistent</methodname>
+     <methodname>ReflectionExtension::isTemporary</methodname>
+     <methodname>ReflectionClass::isCloneable</methodname>
     </simpara>
    </listitem>
   </itemizedlist>
@@ -599,16 +599,16 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     <function>Closure::bind</function>
-     <function>Closure::bindTo</function>
+     <methodname>Closure::bind</methodname>
+     <methodname>Closure::bindTo</methodname>
     </simpara>
    </listitem>
   </itemizedlist>
-  <simpara><classname>PDO_dblib</classname>:</simpara>
+  <simpara><link linkend="ref.pdo-dblib">PDO_dblib</link>:</simpara>
   <itemizedlist>
    <listitem>
     <simpara>
-     <function>PDO::newRowset</function>
+     <methodname>PDO::newRowset</methodname>
     </simpara>
    </listitem>
   </itemizedlist>
@@ -616,12 +616,12 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     <function>StreamWrapper::stream_metadata</function>
+     <methodname>StreamWrapper::stream_metadata</methodname>
     </simpara>
    </listitem>
    <listitem>
     <simpara>
-     <function>StreamWrapper::stream_truncate</function>
+     <methodname>StreamWrapper::stream_truncate</methodname>
     </simpara>
    </listitem>
   </itemizedlist>