diff --git a/java/com/facebook/csslayout/CSSNodeJNI.java b/java/com/facebook/csslayout/CSSNode.java
similarity index 96%
rename from java/com/facebook/csslayout/CSSNodeJNI.java
rename to java/com/facebook/csslayout/CSSNode.java
index e4c30c95..497e175d 100644
--- a/java/com/facebook/csslayout/CSSNodeJNI.java
+++ b/java/com/facebook/csslayout/CSSNode.java
@@ -17,7 +17,7 @@ import java.util.ArrayList;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.soloader.SoLoader;
 
-public class CSSNodeJNI implements CSSNodeAPI<CSSNodeJNI> {
+public class CSSNode implements CSSNodeAPI<CSSNode> {
 
   static {
     try {
@@ -29,8 +29,8 @@ public class CSSNodeJNI implements CSSNodeAPI<CSSNodeJNI> {
     }
   }
 
-  private CSSNodeJNI mParent;
-  private List<CSSNodeJNI> mChildren;
+  private CSSNode mParent;
+  private List<CSSNode> mChildren;
   private MeasureFunction mMeasureFunction;
   private long mNativePointer;
   private Object mData;
@@ -60,10 +60,6 @@ public class CSSNodeJNI implements CSSNodeAPI<CSSNodeJNI> {
       throw new IllegalStateException("You should not reset an attached CSSNode");
     }
 
-    free();
-  }
-
-  private void free() {
     jni_CSSNodeFree(mNativePointer);
     mNativePointer = 0;
     mChildren = null;
@@ -71,30 +67,19 @@ public class CSSNodeJNI implements CSSNodeAPI<CSSNodeJNI> {
     mMeasureFunction = null;
   }
 
-  @Override
-  protected void finalize() throws Throwable {
-    try {
-      if (mNativePointer != 0) {
-        free();
-      }
-    } finally {
-      super.finalize();
-    }
-  }
-
   @Override
   public int getChildCount() {
     return mChildren.size();
   }
 
   @Override
-  public CSSNodeJNI getChildAt(int i) {
+  public CSSNode getChildAt(int i) {
     return mChildren.get(i);
   }
 
   private native void jni_CSSNodeInsertChild(long nativePointer, long childPointer, int index);
   @Override
-  public void addChildAt(CSSNodeJNI child, int i) {
+  public void addChildAt(CSSNode child, int i) {
     assertNativeInstance();
     if (child.mParent != null) {
       throw new IllegalStateException("Child already has a parent, it must be removed first.");
@@ -107,22 +92,23 @@ public class CSSNodeJNI implements CSSNodeAPI<CSSNodeJNI> {
 
   private native void jni_CSSNodeRemoveChild(long nativePointer, long childPointer);
   @Override
-  public CSSNodeJNI removeChildAt(int i) {
+  public CSSNode removeChildAt(int i) {
     assertNativeInstance();
 
-    final CSSNodeJNI child = mChildren.remove(i);
+    final CSSNode child = mChildren.remove(i);
     child.mParent = null;
     jni_CSSNodeRemoveChild(mNativePointer, child.mNativePointer);
     return child;
   }
 
   @Override
-  public @Nullable CSSNodeJNI getParent() {
+  public @Nullable
+  CSSNode getParent() {
     return mParent;
   }
 
   @Override
-  public int indexOf(CSSNodeJNI child) {
+  public int indexOf(CSSNode child) {
     return mChildren.indexOf(child);
   }
 
diff --git a/java/jni/CSSJNI.cpp b/java/jni/CSSJNI.cpp
index 297c3328..d75e37f4 100644
--- a/java/jni/CSSJNI.cpp
+++ b/java/jni/CSSJNI.cpp
@@ -168,7 +168,7 @@ CSS_NODE_JNI_LAYOUT_PROP(jint, CSSDirection, Direction);
 
 jint JNI_OnLoad(JavaVM *vm, void *) {
   return initialize(vm, [] {
-    registerNatives("com/facebook/csslayout/CSSNodeJNI",
+    registerNatives("com/facebook/csslayout/CSSNode",
                     {
                         CSSMakeNativeMethod(jni_CSSNodeNew),
                         CSSMakeNativeMethod(jni_CSSNodeFree),