diff --git a/enums.py b/enums.py
index 00dbdbc7..a94aef4e 100644
--- a/enums.py
+++ b/enums.py
@@ -134,7 +134,7 @@ with open(root + '/CSSLayout/YGEnums.h', 'w') as f:
 for name, values in ENUMS.items():
     with open(root + '/java/com/facebook/csslayout/Yoga%s.java' % name, 'w') as f:
         f.write(LICENSE)
-        f.write('package com.facebook.csslayout;\n\n')
+        f.write('package com.facebook.yoga;\n\n')
         f.write('import com.facebook.proguard.annotations.DoNotStrip;\n\n')
         f.write('@DoNotStrip\n')
         f.write('public enum Yoga%s {\n' % name)
diff --git a/gentest/gentest-java.js b/gentest/gentest-java.js
index 0ae39fa7..7034c617 100644
--- a/gentest/gentest-java.js
+++ b/gentest/gentest-java.js
@@ -28,7 +28,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
 
   emitPrologue:{value:function() {
     this.push([
-      'package com.facebook.csslayout;',
+      'package com.facebook.yoga;',
       '',
       'import org.junit.Test;',
       '',
diff --git a/java/com/facebook/csslayout/YogaAlign.java b/java/com/facebook/csslayout/YogaAlign.java
index 0ad38450..74bcde73 100644
--- a/java/com/facebook/csslayout/YogaAlign.java
+++ b/java/com/facebook/csslayout/YogaAlign.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaConstants.java b/java/com/facebook/csslayout/YogaConstants.java
index 03db3feb..93dc9f81 100644
--- a/java/com/facebook/csslayout/YogaConstants.java
+++ b/java/com/facebook/csslayout/YogaConstants.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 public class YogaConstants {
 
diff --git a/java/com/facebook/csslayout/YogaDimension.java b/java/com/facebook/csslayout/YogaDimension.java
index a73f49c8..dfa3c093 100644
--- a/java/com/facebook/csslayout/YogaDimension.java
+++ b/java/com/facebook/csslayout/YogaDimension.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaDirection.java b/java/com/facebook/csslayout/YogaDirection.java
index 2c0473aa..f0955bd7 100644
--- a/java/com/facebook/csslayout/YogaDirection.java
+++ b/java/com/facebook/csslayout/YogaDirection.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaEdge.java b/java/com/facebook/csslayout/YogaEdge.java
index 811297f0..8c6c7a74 100644
--- a/java/com/facebook/csslayout/YogaEdge.java
+++ b/java/com/facebook/csslayout/YogaEdge.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaExperimentalFeature.java b/java/com/facebook/csslayout/YogaExperimentalFeature.java
index f0d91f0b..19c540ca 100644
--- a/java/com/facebook/csslayout/YogaExperimentalFeature.java
+++ b/java/com/facebook/csslayout/YogaExperimentalFeature.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaFlexDirection.java b/java/com/facebook/csslayout/YogaFlexDirection.java
index b16128db..d01cc96a 100644
--- a/java/com/facebook/csslayout/YogaFlexDirection.java
+++ b/java/com/facebook/csslayout/YogaFlexDirection.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaJustify.java b/java/com/facebook/csslayout/YogaJustify.java
index eb328dd4..be481bf3 100644
--- a/java/com/facebook/csslayout/YogaJustify.java
+++ b/java/com/facebook/csslayout/YogaJustify.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaLogLevel.java b/java/com/facebook/csslayout/YogaLogLevel.java
index 75d74e08..b6b33caa 100644
--- a/java/com/facebook/csslayout/YogaLogLevel.java
+++ b/java/com/facebook/csslayout/YogaLogLevel.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaLogger.java b/java/com/facebook/csslayout/YogaLogger.java
index 82bd19b6..a856b7be 100644
--- a/java/com/facebook/csslayout/YogaLogger.java
+++ b/java/com/facebook/csslayout/YogaLogger.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaMeasureFunction.java b/java/com/facebook/csslayout/YogaMeasureFunction.java
index 84a48521..6570e5b5 100644
--- a/java/com/facebook/csslayout/YogaMeasureFunction.java
+++ b/java/com/facebook/csslayout/YogaMeasureFunction.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaMeasureMode.java b/java/com/facebook/csslayout/YogaMeasureMode.java
index 6ea9d038..68fb6c5d 100644
--- a/java/com/facebook/csslayout/YogaMeasureMode.java
+++ b/java/com/facebook/csslayout/YogaMeasureMode.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaMeasureOutput.java b/java/com/facebook/csslayout/YogaMeasureOutput.java
index 6c968008..7bb845a0 100644
--- a/java/com/facebook/csslayout/YogaMeasureOutput.java
+++ b/java/com/facebook/csslayout/YogaMeasureOutput.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 /**
  * Helpers for building measure output value.
diff --git a/java/com/facebook/csslayout/YogaNode.java b/java/com/facebook/csslayout/YogaNode.java
index 99314b02..2aa11faa 100644
--- a/java/com/facebook/csslayout/YogaNode.java
+++ b/java/com/facebook/csslayout/YogaNode.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import javax.annotation.Nullable;
 
diff --git a/java/com/facebook/csslayout/YogaNodeAPI.java b/java/com/facebook/csslayout/YogaNodeAPI.java
index f56401e7..cb3b5be8 100644
--- a/java/com/facebook/csslayout/YogaNodeAPI.java
+++ b/java/com/facebook/csslayout/YogaNodeAPI.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 // This only exists for legacy reasons. It will be removed sometime in the near future.
 public interface YogaNodeAPI<YogaNodeType extends YogaNodeAPI> {
diff --git a/java/com/facebook/csslayout/YogaOverflow.java b/java/com/facebook/csslayout/YogaOverflow.java
index 0fa04bb4..d0509e24 100644
--- a/java/com/facebook/csslayout/YogaOverflow.java
+++ b/java/com/facebook/csslayout/YogaOverflow.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaPositionType.java b/java/com/facebook/csslayout/YogaPositionType.java
index 0215c627..fe2d4fd2 100644
--- a/java/com/facebook/csslayout/YogaPositionType.java
+++ b/java/com/facebook/csslayout/YogaPositionType.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaPrintOptions.java b/java/com/facebook/csslayout/YogaPrintOptions.java
index fae22f0a..dae28660 100644
--- a/java/com/facebook/csslayout/YogaPrintOptions.java
+++ b/java/com/facebook/csslayout/YogaPrintOptions.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/com/facebook/csslayout/YogaWrap.java b/java/com/facebook/csslayout/YogaWrap.java
index 8a371d5e..91cc3d5a 100644
--- a/java/com/facebook/csslayout/YogaWrap.java
+++ b/java/com/facebook/csslayout/YogaWrap.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;
 
diff --git a/java/jni/YGJNI.cpp b/java/jni/YGJNI.cpp
index 085ba5b9..2e9fd99d 100644
--- a/java/jni/YGJNI.cpp
+++ b/java/jni/YGJNI.cpp
@@ -58,7 +58,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node,
                                float height,
                                YGMeasureMode heightMode) {
   if (auto obj = YGNodeJobject(node)->lockLocal()) {
-    static auto measureFunc = findClassLocal("com/facebook/csslayout/YogaNode")
+    static auto measureFunc = findClassLocal("com/facebook/yoga/YogaNode")
                                   ->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
 
     YGTransferLayoutDirection(node, obj);
@@ -81,7 +81,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node,
 }
 
 struct JYogaLogLevel : public JavaClass<JYogaLogLevel> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/csslayout/YogaLogLevel;";
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogLevel;";
 };
 
 static global_ref<jobject> *jLogger;
@@ -89,7 +89,7 @@ static int YGLog(YGLogLevel level, const char *format, va_list args) {
   char buffer[256];
   int result = vsnprintf(buffer, sizeof(buffer), format, args);
 
-  static auto logFunc = findClassLocal("com/facebook/csslayout/YogaLogger")
+  static auto logFunc = findClassLocal("com/facebook/yoga/YogaLogger")
                             ->getMethod<void(local_ref<JYogaLogLevel>, jstring)>("log");
 
   static auto logLevelFromInt =
@@ -261,7 +261,7 @@ YG_NODE_JNI_STYLE_PROP(jfloat, float, AspectRatio);
 
 jint JNI_OnLoad(JavaVM *vm, void *) {
   return initialize(vm, [] {
-    registerNatives("com/facebook/csslayout/YogaNode",
+    registerNatives("com/facebook/yoga/YogaNode",
                     {
                         YGMakeNativeMethod(jni_YGNodeNew),
                         YGMakeNativeMethod(jni_YGNodeFree),
diff --git a/java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java b/java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java
index 743d1ccc..bdfaf0e1 100644
--- a/java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java
+++ b/java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGAbsolutePositionTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGAlignContentTest.java b/java/tests/com/facebook/csslayout/YGAlignContentTest.java
index c135cfdf..c0f6afa5 100644
--- a/java/tests/com/facebook/csslayout/YGAlignContentTest.java
+++ b/java/tests/com/facebook/csslayout/YGAlignContentTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignContentTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGAlignItemsTest.java b/java/tests/com/facebook/csslayout/YGAlignItemsTest.java
index 6e070a34..c7fd7a2a 100644
--- a/java/tests/com/facebook/csslayout/YGAlignItemsTest.java
+++ b/java/tests/com/facebook/csslayout/YGAlignItemsTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignItemsTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGAlignSelfTest.java b/java/tests/com/facebook/csslayout/YGAlignSelfTest.java
index 4cd7fd94..f8dc750b 100644
--- a/java/tests/com/facebook/csslayout/YGAlignSelfTest.java
+++ b/java/tests/com/facebook/csslayout/YGAlignSelfTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignSelfTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGBorderTest.java b/java/tests/com/facebook/csslayout/YGBorderTest.java
index 2d660f2b..f264a878 100644
--- a/java/tests/com/facebook/csslayout/YGBorderTest.java
+++ b/java/tests/com/facebook/csslayout/YGBorderTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGBorderTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGFlexDirectionTest.java b/java/tests/com/facebook/csslayout/YGFlexDirectionTest.java
index 0e24b26c..4a731e17 100644
--- a/java/tests/com/facebook/csslayout/YGFlexDirectionTest.java
+++ b/java/tests/com/facebook/csslayout/YGFlexDirectionTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexDirectionTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGFlexTest.java b/java/tests/com/facebook/csslayout/YGFlexTest.java
index 11508e2f..ca7befd2 100644
--- a/java/tests/com/facebook/csslayout/YGFlexTest.java
+++ b/java/tests/com/facebook/csslayout/YGFlexTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGFlexWrapTest.java b/java/tests/com/facebook/csslayout/YGFlexWrapTest.java
index c05f1f55..f4772efe 100644
--- a/java/tests/com/facebook/csslayout/YGFlexWrapTest.java
+++ b/java/tests/com/facebook/csslayout/YGFlexWrapTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexWrapTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGJustifyContentTest.java b/java/tests/com/facebook/csslayout/YGJustifyContentTest.java
index 8dc6d078..19df3a5c 100644
--- a/java/tests/com/facebook/csslayout/YGJustifyContentTest.java
+++ b/java/tests/com/facebook/csslayout/YGJustifyContentTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGJustifyContentTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGMarginTest.java b/java/tests/com/facebook/csslayout/YGMarginTest.java
index 0f2cae7a..35859473 100644
--- a/java/tests/com/facebook/csslayout/YGMarginTest.java
+++ b/java/tests/com/facebook/csslayout/YGMarginTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGMarginTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java b/java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java
index 9dc7ce30..f37a5c54 100644
--- a/java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java
+++ b/java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGMinMaxDimensionTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGPaddingTest.java b/java/tests/com/facebook/csslayout/YGPaddingTest.java
index 2ea21f69..22349186 100644
--- a/java/tests/com/facebook/csslayout/YGPaddingTest.java
+++ b/java/tests/com/facebook/csslayout/YGPaddingTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGPaddingTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YGRoundingTest.java b/java/tests/com/facebook/csslayout/YGRoundingTest.java
index ae478b9e..33624b15 100644
--- a/java/tests/com/facebook/csslayout/YGRoundingTest.java
+++ b/java/tests/com/facebook/csslayout/YGRoundingTest.java
@@ -9,7 +9,7 @@
 
  // @Generated by gentest/gentest.rb from gentest/fixtures/YGRoundingTest.html
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;
 
diff --git a/java/tests/com/facebook/csslayout/YogaNodeTest.java b/java/tests/com/facebook/csslayout/YogaNodeTest.java
index 3dc8339e..d7c759ea 100644
--- a/java/tests/com/facebook/csslayout/YogaNodeTest.java
+++ b/java/tests/com/facebook/csslayout/YogaNodeTest.java
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-package com.facebook.csslayout;
+package com.facebook.yoga;
 
 import org.junit.Test;