--- a/microdata-rdf/index.html	Tue Feb 28 18:34:12 2012 -0800
+++ b/microdata-rdf/index.html	Tue Feb 28 22:21:21 2012 -0800
@@ -1153,8 +1153,8 @@
   <section>
     <h2>Generate the triples</h2>
     <p>
-      When the user agent is to Generate triples for an <tref>item</tref> <em>item</em>, given an
-      <tref>Evaluation Context</tref>, it must run the following steps:
+      When the user agent is to Generate triples for an <tref>item</tref> <em>item</em>, given
+      <tref>evaluation context</tref>, it must run the following steps:
     </p>
     <p class="note">
       This algorithm has undergone substantial change from the original microdata specification [[!MICRODATA]].
@@ -1189,9 +1189,11 @@
         <code><cite><a href="http://www.w3.org/TR/2011/WD-microdata-20110525/#dom-itemtype">element.itemType</a></cite></code>
         of the element defining the <tref>item</tref>.
       </li>
+      <li>If <em>type</em> is an <tref>absolute URL</tref>, set <tref>current name</tref> in
+        <tref>evaluation context</tref> to null.</li>
       <li>
-        If <em>type</em> is not an <tref>absolute URL</tref>, set it to <tref>current type</tref> from the
-        <tref>Evaluation Context</tref> if not empty.
+        Otherwise, set <em>type</em> to <tref>current type</tref> from
+        <tref>evaluation context</tref> if not empty.
       </li>
       <li>If the <tref>registry</tref> contains a <tref>URI prefix</tref> that is a character for character match of <em>type</em>
         up to the length of the <tref>URI prefix</tref>, set <em>vocab</em> as that <tref>URI prefix</tref>.
@@ -1279,13 +1281,13 @@
       <li id="scheme-context">If <em>scheme</em> is <code>contextual</code>, return the <tref>URI reference</tref>
         constructed as follows:
         <ol class="algorithm">
-          <li>Let <em>s</em> be <tref>current type</tref> from <em>context</em>.</li>
+          <li>Let <em>s</em> be <tref>current name</tref> from <em>context</em>.</li>
           <li>If <code>http://www.w3.org/ns/md?type=</code> is a prefix of <em>s</em>,
             return the concatenation of <em>s</em>, a U+002E FULL STOP character (.) and
             the <tref>fragment-escape</tref>d value of <em>name</em>.
           </li>
           <li>Otherwise, return the concatenation of <code>http://www.w3.org/ns/md?type=</code>,
-            the <tref>fragment-escape</tref>d value of <em>s</em>, the string <code>&amp;prop=</code>,
+            the <tref>fragment-escape</tref>d value of <tref>current type</tref>, the string <code>&amp;prop=</code>,
             and the <tref>fragment-escape</tref>d value of <em>name</em>.
           </li>
         </ol>