diff --git a/android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java b/android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java
index c6b87e5e..e617a9cf 100644
--- a/android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java
+++ b/android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java
@@ -17,6 +17,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeFactory;
 
 /**
  * Much like a {@link YogaLayout}, except this class does not render itself (the container) to the
@@ -32,7 +33,7 @@ public class VirtualYogaLayout extends ViewGroup {
 
   final private List<View> mChildren = new LinkedList<>();
   final private Map<View, YogaNode> mYogaNodes = new HashMap<>();
-  final private YogaNode mYogaNode = YogaNode.create();
+  final private YogaNode mYogaNode = YogaNodeFactory.create();
 
   public VirtualYogaLayout(Context context) {
     super(context);
@@ -72,7 +73,7 @@ public class VirtualYogaLayout extends ViewGroup {
       return;
     }
 
-    YogaNode node = YogaNode.create();
+    YogaNode node = YogaNodeFactory.create();
     YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
     YogaLayout.applyLayoutParams(lp, node, child);
     node.setData(child);
diff --git a/android/src/main/java/com/facebook/yoga/android/YogaLayout.java b/android/src/main/java/com/facebook/yoga/android/YogaLayout.java
index 92e2c86c..f8fb3d64 100644
--- a/android/src/main/java/com/facebook/yoga/android/YogaLayout.java
+++ b/android/src/main/java/com/facebook/yoga/android/YogaLayout.java
@@ -28,6 +28,7 @@ import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeFactory;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaWrap;
@@ -77,7 +78,7 @@ public class YogaLayout extends ViewGroup {
   public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
-    mYogaNode = YogaNode.create();
+    mYogaNode = YogaNodeFactory.create();
     mYogaNodes = new HashMap<>();
 
     mYogaNode.setData(this);
@@ -154,7 +155,7 @@ public class YogaLayout extends ViewGroup {
       if(mYogaNodes.containsKey(child)) {
         childNode = mYogaNodes.get(child);
       } else {
-        childNode = YogaNode.create();
+        childNode = YogaNodeFactory.create();
       }
 
       childNode.setData(child);
diff --git a/java/tests/com/facebook/yoga/TestParametrization.java b/java/tests/com/facebook/yoga/TestParametrization.java
index 0ae47233..0e20ddaf 100644
--- a/java/tests/com/facebook/yoga/TestParametrization.java
+++ b/java/tests/com/facebook/yoga/TestParametrization.java
@@ -14,12 +14,12 @@ public class TestParametrization {
     NodeFactory nodeFactory = new NodeFactory() {
       @Override
       public YogaNode create() {
-        return YogaNode.create();
+        return YogaNodeFactory.create();
       }
 
       @Override
       public YogaNode create(YogaConfig config) {
-        return YogaNode.create(config);
+        return YogaNodeFactory.create(config);
       }
 
       @Override