diff --git a/ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk b/ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk
index dc4401b19..d664171b0 100644
--- a/ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk
+++ b/ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := csslayout
+LOCAL_MODULE := yoga
 
 LOCAL_SRC_FILES := \
   jni/YGJNI.cpp
@@ -15,7 +15,7 @@ LOCAL_CFLAGS += $(CXX11_FLAGS)
 LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
 
 LOCAL_LDLIBS += -landroid -llog
-LOCAL_STATIC_LIBRARIES := libcsslayoutcore
+LOCAL_STATIC_LIBRARIES := yogacore
 LOCAL_SHARED_LIBRARIES := libfb
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/first-party/csslayoutjni/BUCK b/ReactAndroid/src/main/jni/first-party/csslayoutjni/BUCK
index 540323fa9..8f1348719 100644
--- a/ReactAndroid/src/main/jni/first-party/csslayoutjni/BUCK
+++ b/ReactAndroid/src/main/jni/first-party/csslayoutjni/BUCK
@@ -4,7 +4,7 @@ include_defs('//ReactAndroid/DEFS')
 if IS_OSS_BUILD:
   cxx_library(
     name = 'jni',
-    soname = 'libcsslayout.$(ext)',
+    soname = 'libyoga.$(ext)',
     srcs = glob(['jni/*.cpp']),
     header_namespace = '',
     compiler_flags = [
diff --git a/ReactCommon/CSSLayout/Android.mk b/ReactCommon/CSSLayout/Android.mk
index 8a54f77b6..ad431ba5a 100644
--- a/ReactCommon/CSSLayout/Android.mk
+++ b/ReactCommon/CSSLayout/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := csslayoutcore
+LOCAL_MODULE := yogacore
 
 LOCAL_SRC_FILES := \
   CSSLayout/Yoga.c \