--- a/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/TruffleTypes.java	Tue Apr 23 16:19:52 2013 +0200
+++ b/graal/com.oracle.truffle.codegen.processor/src/com/oracle/truffle/codegen/processor/TruffleTypes.java	Tue Apr 23 20:15:52 2013 +0200
@@ -28,8 +28,8 @@
 import javax.lang.model.type.*;
 import javax.tools.Diagnostic.*;
 
+import com.oracle.truffle.api.*;
 import com.oracle.truffle.api.frame.*;
-import com.oracle.truffle.api.intrinsics.*;
 import com.oracle.truffle.api.nodes.*;
 import com.oracle.truffle.api.nodes.Node.Child;
 import com.oracle.truffle.api.nodes.Node.Children;
@@ -45,7 +45,7 @@
     private final TypeMirror frame;
     private final DeclaredType childAnnotation;
     private final DeclaredType childrenAnnotation;
-    private final TypeMirror truffleIntrinsics;
+    private final TypeMirror compilerDirectives;
 
     private final List<String> errors = new ArrayList<>();
 
@@ -56,7 +56,7 @@
         frame = getRequired(context, VirtualFrame.class);
         childAnnotation = getRequired(context, Child.class);
         childrenAnnotation = getRequired(context, Children.class);
-        truffleIntrinsics = getRequired(context, TruffleIntrinsics.class);
+        compilerDirectives = getRequired(context, CompilerDirectives.class);
     }
 
     public boolean verify(ProcessorContext context, Element element, AnnotationMirror mirror) {
@@ -79,8 +79,8 @@
         return (DeclaredType) type;
     }
 
-    public TypeMirror getTruffleIntrinsics() {
-        return truffleIntrinsics;
+    public TypeMirror getCompilerDirectives() {
+        return compilerDirectives;
     }
 
     public TypeMirror getNode() {