--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExecutionContext.java	Wed Jul 02 23:40:19 2014 +0200
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/ExecutionContext.java	Wed Jul 02 16:06:42 2014 -0700
@@ -122,7 +122,7 @@
      * Returns all existing probes with specific tag, or all probes if {@code tag = null}; empty
      * collection if no probes found.
      */
-    public final Collection<Probe> findProbesTaggedAs(PhylumTag tag) {
+    public final Collection<Probe> findProbesTaggedAs(SyntaxTag tag) {
         return probeManager.findProbesTaggedAs(tag);
     }
 
@@ -140,9 +140,9 @@
      *
      * @throws IllegalStateException if a trap is already set
      */
-    public final void setPhylumTrap(PhylumTrap trap) throws IllegalStateException {
+    public final void setTagTrap(SyntaxTagTrap trap) throws IllegalStateException {
         // TODO (mlvdv) consider allowing multiple traps (without inhibiting Truffle inlining)
-        probeManager.setPhylumTrap(trap);
+        probeManager.setTagTrap(trap);
     }
 
     /**
@@ -150,8 +150,8 @@
      *
      * @throws IllegalStateException if no trap is set.
      */
-    public final void clearPhylumTrap() {
-        probeManager.clearPhylumTrap();
+    public final void clearTagTrap() {
+        probeManager.clearTagTrap();
     }
 
     /**