--- a/test-suite/tests/compact-0021-context.jsonld	Sat Dec 08 13:49:20 2012 +0100
+++ b/test-suite/tests/compact-0021-context.jsonld	Sat Dec 08 14:13:40 2012 +0100
@@ -1,6 +1,6 @@
 {
   "@context": {
     "@vocab": "http://example.com/subdir/",
-    "vocab/date": { "@type": "vocab/dateTime" }
+    "vocab/date": { "@type": "vocab/types/dateTime" }
   }
 }

--- a/test-suite/tests/compact-0021-in.jsonld	Sat Dec 08 13:49:20 2012 +0100
+++ b/test-suite/tests/compact-0021-in.jsonld	Sat Dec 08 14:13:40 2012 +0100
@@ -1,11 +1,11 @@
 [
   {
     "@id": "http://example.com/subdir/id/1",
-    "@type": [ "http://example.com/subdir/vocab/test" ],
+    "@type": [ "http://example.com/subdir/vocab/types/Test" ],
     "http://example.com/subdir/vocab/date": [
       {
         "@value": "2011-01-25T00:00:00Z",
-        "@type": "http://example.com/subdir/vocab/dateTime"
+        "@type": "http://example.com/subdir/vocab/types/dateTime"
       }
     ],
     "http://example.com/subdir/vocab/embed": [
@@ -14,7 +14,7 @@
         "http://example.com/subdir/vocab/expandedDate": [
           {
             "@value": "2012-08-01T00:00:00Z",
-            "@type": "http://example.com/subdir/vocab/dateTime"
+            "@type": "http://example.com/subdir/vocab/types/dateTime"
           }
         ]
       }

--- a/test-suite/tests/compact-0021-out.jsonld	Sat Dec 08 13:49:20 2012 +0100
+++ b/test-suite/tests/compact-0021-out.jsonld	Sat Dec 08 14:13:40 2012 +0100
@@ -1,16 +1,16 @@
 {
   "@context": {
     "@vocab": "http://example.com/subdir/",
-    "vocab/date": { "@type": "vocab/dateTime" }
+    "vocab/date": { "@type": "vocab/types/dateTime" }
   },
   "@id": "http://example.com/subdir/id/1",
-  "@type": "vocab/test",
+  "@type": "vocab/types/Test",
   "vocab/date": "2011-01-25T00:00:00Z",
   "vocab/embed": {
     "@id": "http://example.com/subdir/id/2",
     "vocab/expandedDate": {
       "@value": "2012-08-01T00:00:00Z",
-      "@type": "vocab/dateTime"
+      "@type": "vocab/types/dateTime"
     }
   }
 }