--- a/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseProfilingInfo.java	Fri Jun 08 23:47:42 2012 +0200
+++ b/graal/com.oracle.max.criutils/src/com/oracle/max/criutils/BaseProfilingInfo.java	Sat Jun 09 16:52:12 2012 +0200
@@ -30,16 +30,16 @@
  * Dummy profiling information in case that a method was not executed frequently enough so that
  * no profiling information does exist yet, or in case that the profiling information should not be used.
  */
-public final class BaseProfilingInfo implements RiProfilingInfo {
-    private static final RiProfilingInfo[] NO_PROFILING_INFO = new RiProfilingInfo[] {
-        new BaseProfilingInfo(RiExceptionSeen.TRUE),
-        new BaseProfilingInfo(RiExceptionSeen.FALSE),
-        new BaseProfilingInfo(RiExceptionSeen.NOT_SUPPORTED)
+public final class BaseProfilingInfo implements ProfilingInfo {
+    private static final ProfilingInfo[] NO_PROFILING_INFO = new ProfilingInfo[] {
+        new BaseProfilingInfo(ExceptionSeen.TRUE),
+        new BaseProfilingInfo(ExceptionSeen.FALSE),
+        new BaseProfilingInfo(ExceptionSeen.NOT_SUPPORTED)
     };
 
-    private final RiExceptionSeen exceptionSeen;
+    private final ExceptionSeen exceptionSeen;
 
-    BaseProfilingInfo(RiExceptionSeen exceptionSeen) {
+    BaseProfilingInfo(ExceptionSeen exceptionSeen) {
         this.exceptionSeen = exceptionSeen;
     }
 
@@ -49,7 +49,7 @@
     }
 
     @Override
-    public RiTypeProfile getTypeProfile(int bci) {
+    public JavaTypeProfile getTypeProfile(int bci) {
         return null;
     }
 
@@ -64,7 +64,7 @@
     }
 
     @Override
-    public RiExceptionSeen getExceptionSeen(int bci) {
+    public ExceptionSeen getExceptionSeen(int bci) {
         return exceptionSeen;
     }
 
@@ -73,12 +73,12 @@
         return -1;
     }
 
-    public static RiProfilingInfo get(RiExceptionSeen exceptionSeen) {
+    public static ProfilingInfo get(ExceptionSeen exceptionSeen) {
         return NO_PROFILING_INFO[exceptionSeen.ordinal()];
     }
 
     @Override
-    public int getDeoptimizationCount(RiDeoptReason reason) {
+    public int getDeoptimizationCount(DeoptimizationReason reason) {
         return 0;
     }