--- a/spec/latest/index.html	Wed Aug 03 16:38:11 2011 -0700
+++ b/spec/latest/index.html	Wed Aug 03 16:40:10 2011 -0700
@@ -950,7 +950,7 @@
 <!--
 {
 ...
-  "@": "http://example.org/people#joebob",
+  "@subject": "http://example.org/people#joebob",
   "foaf:nick": ****["joe", "bob", "jaybee"]****,
 ...
 }
@@ -985,7 +985,7 @@
 <!--
 {
 ...
-  "@": "http://example.org/articles/8",
+  "@subject": "http://example.org/articles/8",
   "dcterms:modified": ****
   [
     {
@@ -1985,15 +1985,15 @@
 <pre class="example" data-transform="updateExample">
 <!--
 {
-  "@": 
+  "@subject": 
   [
     {
-      "@": "http://example.org/people#john",
-      "a": "foaf:Person"
+      "@subject": "http://example.org/people#john",
+      "@type": "foaf:Person"
     },
     {
-      "@": "http://example.org/people#jane",
-      "a": "foaf:Person"
+      "@subject": "http://example.org/people#jane",
+      "@type": "foaf:Person"
     }
   ]
 }
@@ -2006,12 +2006,12 @@
 <!--
 [
   {
-    "@": "http://example.org/people#john",
-    "a": "foaf:Person"
+    "@subject": "http://example.org/people#john",
+    "@type": "foaf:Person"
   },
   {
-    "@": "http://example.org/people#jane",
-    "a": "foaf:Person"
+    "@subject": "http://example.org/people#jane",
+    "@type": "foaf:Person"
   }
 ]
 -->
@@ -2298,20 +2298,20 @@
 <!--
 [
  {
-   "@": "_:bnode1",
-   "a": "foaf:Person",
+   "@subject": "_:bnode1",
+   "@type": "foaf:Person",
    "foaf:homepage": "http://example.com/bob/",
    "foaf:name": "Bob"
  },
  {
-   "@": "_:bnode2",
-   "a": "foaf:Person",
+   "@subject": "_:bnode2",
+   "@type": "foaf:Person",
    "foaf:homepage": "http://example.com/eve/",
    "foaf:name": "Eve"
  },
  {
-   "@": "_:bnode3",
-   "a": "foaf:Person",
+   "@subject": "_:bnode3",
+   "@type": "foaf:Person",
    "foaf:homepage": "http://example.com/manu/",
    "foaf:name": "Manu"
  }
@@ -2350,8 +2350,8 @@
     "fn": "http://microformats.org/profile/hcard#fn",
     "@coerce": { "xsd:anyURI": "url" }
   },
-  "@": "_:bnode1",
-  "a": "vcard",
+  "@subject": "_:bnode1",
+  "@type": "vcard",
   "url": "http://tantek.com/",
   "fn": "Tantek Çelik"
 }
@@ -2403,21 +2403,21 @@
 <!--
 [
   {
-    "@": "http://purl.oreilly.com/works/45U8QJGZSQKDH8N",
-    "a": "http://purl.org/vocab/frbr/core#Work",
+    "@subject": "http://purl.oreilly.com/works/45U8QJGZSQKDH8N",
+    "@type": "http://purl.org/vocab/frbr/core#Work",
     "http://purl.org/dc/terms/title": "Just a Geek",
     "http://purl.org/dc/terms/creator": "Whil Wheaton",
     "http://purl.org/vocab/frbr/core#realization": 
       ["http://purl.oreilly.com/products/9780596007683.BOOK", "http://purl.oreilly.com/products/9780596802189.EBOOK"]
   },
   {
-    "@": "http://purl.oreilly.com/products/9780596007683.BOOK",
-    "a": "http://purl.org/vocab/frbr/core#Expression",
+    "@subject": "http://purl.oreilly.com/products/9780596007683.BOOK",
+    "@type": "http://purl.org/vocab/frbr/core#Expression",
     "http://purl.org/dc/terms/type": "http://purl.oreilly.com/product-types/BOOK"
   },
   {
-    "@": "http://purl.oreilly.com/products/9780596802189.EBOOK",
-    "a": "http://purl.org/vocab/frbr/core#Expression",
+    "@subject": "http://purl.oreilly.com/products/9780596802189.EBOOK",
+    "@type": "http://purl.org/vocab/frbr/core#Expression",
     "http://purl.org/dc/terms/type": "http://purl.oreilly.com/product-types/EBOOK"
   }
 ]
@@ -2469,7 +2469,7 @@
 <!--
 {
   ****"@context": { "myvocab": "http://example.org/myvocab#" }****,
-  "a": "foaf:Person",
+  "@type": "foaf:Person",
   "foaf:name": "Manu Sporny",
   "foaf:homepage": "http://manu.sporny.org/",
   "sioc:avatar": "http://twitter.com/account/profile_image/manusporny"****,