diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java
index de446d27fbfda88d551c77b885cd146a318896eb..70bb609cb0dc69ff549136c4f77ee0b9030c5bf5 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/EngineRootNode.java
@@ -58,7 +58,7 @@ class EngineRootNode extends RootNode {
     private final ContextReference<RContext> contextReference;
 
     @Child private EngineBodyNode bodyNode;
-    @Child private R2Foreign r2Foreign = R2ForeignNodeGen.create();
+    @Child private R2Foreign r2Foreign = R2Foreign.create();
 
     EngineRootNode(EngineBodyNode bodyNode, RContext context, SourceSection sourceSection, MaterializedFrame executionFrame) {
         super(context.getLanguage());
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java
index 597b0fb89a05d4e8a8c5b713b0653bb31ea38b1a..abe412ecd675788f0dbe662544bab904d07a273e 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/ListMR.java
@@ -395,7 +395,7 @@ public class ListMR {
         private void initR2ForeignNode() {
             if (r2Foreign == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                r2Foreign = insert(R2ForeignNodeGen.create());
+                r2Foreign = insert(R2Foreign.create());
             }
         }
 
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java
index f9c65193529f6b9c9212a6c26c872935fde9bf4d..e1a439ff63e519ebab7d223b882155cc71647a37 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RArgsValuesAndNamesMR.java
@@ -120,7 +120,7 @@ public class RArgsValuesAndNamesMR {
     }
 
     abstract static class RArgsValuesAndNamesReadImplNode extends Node {
-        @Child private R2Foreign r2Foreign = R2ForeignNodeGen.create();
+        @Child private R2Foreign r2Foreign = R2Foreign.create();
 
         private final ConditionProfile unknownIdentifier = ConditionProfile.createBinaryProfile();
 
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java
index 709988c5c6a8cfd1b9b4b5de5112e7a6b5f7cc68..8c2e95c851a0187627384cb56f1ba8c6f6b47dc1 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/REnvironmentMR.java
@@ -164,7 +164,7 @@ public class REnvironmentMR {
         private void initR2ForeignNode() {
             if (r2Foreign == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                r2Foreign = insert(R2ForeignNodeGen.create());
+                r2Foreign = insert(R2Foreign.create());
             }
         }
 
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java
index c654f1584368d62baf17870f8a64d11f6432db08..a01ac0bcf2cec8b5f68c83b20809334aade31ec9 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RFunctionMR.java
@@ -59,7 +59,7 @@ public class RFunctionMR {
     @Resolve(message = "EXECUTE")
     public abstract static class RFunctionExecuteNode extends Node {
         @Child private Foreign2R foreign2R = Foreign2RNodeGen.create();
-        @Child private R2Foreign r2Foreign = R2ForeignNodeGen.create();
+        @Child private R2Foreign r2Foreign = R2Foreign.create();
         @Child private RExplicitCallNode call = RExplicitCallNode.create();
 
         protected Object access(RFunction receiver, Object[] arguments) {
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java
index 3b9f6cdd3949a799984ba88a28ee7415c14c031e..a98549f7cf1ca14ca814b6996cbb848208078d4c 100644
--- a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java
+++ b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/interop/RS4ObjectMR.java
@@ -157,7 +157,7 @@ public class RS4ObjectMR {
 
             if (r2Foreign == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-                r2Foreign = insert(R2ForeignNodeGen.create());
+                r2Foreign = insert(R2Foreign.create());
             }
             return r2Foreign.execute(value);
         }
diff --git a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
index cf00af05aac70b7a0bb357af3d8dd564c42f8e3b..b248eea17540ea300748cdedb91176e1eee3f9d5 100644
--- a/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
+++ b/com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/fastr/FastRInterop.java
@@ -672,7 +672,7 @@ public class FastRInterop {
         }
 
         protected R2Foreign createR2Foreign() {
-            return R2ForeignNodeGen.create();
+            return R2Foreign.create();
         }
     }
 
@@ -818,7 +818,7 @@ public class FastRInterop {
         }
 
         protected R2Foreign createR2Foreign() {
-            return R2ForeignNodeGen.create();
+            return R2Foreign.create();
         }
 
         private static int[] getDim(boolean flat, RAbstractVector vec) {