diff --git a/chapters/streams.common.xml b/chapters/streams.common.xml
index 36ad0a9dd2..79d199a162 100755
--- a/chapters/streams.common.xml
+++ b/chapters/streams.common.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
 <!-- Author: Wez Furlong <wez@thebrainroom.com>
   Please contact me before making any major amendments to the
   content of this section.  Splitting/Merging are fine if they are
@@ -16,7 +16,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_stat_path</methodname>
       <methodparam><type>char *</type><parameter>path</parameter></methodparam>
       <methodparam><type>php_stream_statbuf *</type><parameter>ssb</parameter></methodparam>
@@ -38,7 +38,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_stat</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>php_stream_statbuf *</type><parameter>ssb</parameter></methodparam>
@@ -61,7 +61,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>php_stream *</type><methodname>php_stream_open_wrapper</methodname>
       <methodparam><type>char *</type><parameter>path</parameter></methodparam>
       <methodparam><type>char *</type><parameter>mode</parameter></methodparam>
@@ -202,7 +202,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>size_t</type><methodname>php_stream_read</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>char *</type><parameter>buf</parameter></methodparam>
@@ -241,7 +241,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>size_t</type><methodname>php_stream_write</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>const char *</type><parameter>buf</parameter></methodparam>
@@ -270,7 +270,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_eof</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
      </methodsynopsis>
@@ -292,7 +292,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_getc</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
      </methodsynopsis>
@@ -318,7 +318,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>char *</type><methodname>php_stream_gets</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>char *</type><parameter>buf</parameter></methodparam>
@@ -353,7 +353,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_close</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
      </methodsynopsis>
@@ -378,7 +378,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_flush</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
      </methodsynopsis>
@@ -402,7 +402,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_seek</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>off_t</type><parameter>offset</parameter></methodparam>
@@ -445,7 +445,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>off_t</type><methodname>php_stream_tell</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
      </methodsynopsis>
@@ -464,7 +464,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>size_t</type><methodname>php_stream_copy_to_stream</methodname>
       <methodparam><type>php_stream *</type><parameter>src</parameter></methodparam>
       <methodparam><type>php_stream *</type><parameter>dest</parameter></methodparam>
@@ -495,7 +495,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>size_t</type><methodname>php_stream_copy_to_mem</methodname>
       <methodparam><type>php_stream *</type><parameter>src</parameter></methodparam>
       <methodparam><type>char **</type><parameter>buf</parameter></methodparam>
@@ -533,7 +533,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_make_seekable</methodname>
       <methodparam><type>php_stream *</type><parameter>origstream</parameter></methodparam>
       <methodparam><type>php_stream **</type><parameter>newstream</parameter></methodparam>
@@ -641,7 +641,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_cast</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>int</type><parameter>castas</parameter></methodparam>
@@ -752,7 +752,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_can_cast</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>int</type><parameter>castas</parameter></methodparam>
@@ -788,7 +788,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_is_persistent</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
      </methodsynopsis>
@@ -806,7 +806,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_stream_is</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
       <methodparam><type>int</type><parameter>istype</parameter></methodparam>
@@ -872,7 +872,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>size_t</type><methodname>php_stream_passthru</methodname>
       <methodparam><type>php_stream *</type><parameter>stream</parameter></methodparam>
      </methodsynopsis>
@@ -893,7 +893,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_register_url_stream_wrapper</methodname>
       <methodparam><type>char *</type><parameter>protocol</parameter></methodparam>
       <methodparam><type>php_stream_wrapper *</type><parameter>wrapper</parameter></methodparam>
@@ -919,7 +919,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>int</type><methodname>php_unregister_url_stream_wrapper</methodname>
       <methodparam><type>char *</type><parameter>protocol</parameter></methodparam>
       <methodparam><type>TSRMLS_DC</type><parameter></parameter></methodparam>
@@ -938,7 +938,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>php_stream *</type><methodname>php_stream_open_wrapper_ex</methodname>
       <methodparam><type>char *</type><parameter>path</parameter></methodparam>
       <methodparam><type>char *</type><parameter>mode</parameter></methodparam>
@@ -962,7 +962,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-     <methodsynopsis>
+     <methodsynopsis role="c">
       <type>FILE *</type><methodname>php_stream_open_wrapper_as_file</methodname>
       <methodparam><type>char *</type><parameter>path</parameter></methodparam>
       <methodparam><type>char *</type><parameter>mode</parameter></methodparam>
@@ -984,7 +984,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-    <methodsynopsis>
+    <methodsynopsis role="c">
      <type>int</type><methodname>php_stream_filter_register_factory</methodname>
      <methodparam><type>const char *</type><parameter>filterpattern</parameter></methodparam>
      <methodparam><type>php_stream_filter_factory *</type><parameter>factory</parameter></methodparam>
@@ -1013,7 +1013,7 @@
    </refnamediv>
    <refsect1>
     <title>Description</title>
-    <methodsynopsis>
+    <methodsynopsis role="c">
      <type>int</type><methodname>php_stream_filter_unregister_factory</methodname>
      <methodparam><type>const char *</type><parameter>filterpattern</parameter></methodparam>
     </methodsynopsis>