diff --git a/.travis.yml b/.travis.yml
index 253f4c41..09a753b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ before_install:
 script:
   - buck test //:CSSLayout
   - buck test //java:java
-  - buck test //uikit/CSSLayout:CSSLayout --config cxx.default_platform=iphonesimulator-x86_64
+  - buck test //CSSLayoutKit:CSSLayoutKit --config cxx.default_platform=iphonesimulator-x86_64
   - buck run  //benchmark:benchmark
   - git checkout HEAD^
   - buck run  //benchmark:benchmark
diff --git a/uikit/CSSLayout/BUCK b/CSSLayoutKit/BUCK
similarity index 90%
rename from uikit/CSSLayout/BUCK
rename to CSSLayoutKit/BUCK
index 2c9ec8fd..089d6f09 100644
--- a/uikit/CSSLayout/BUCK
+++ b/CSSLayoutKit/BUCK
@@ -10,9 +10,9 @@ include_defs('//CSSLAYOUT_DEFS')
 UIKIT_CSSLAYOUT_COMPILER_FLAGS = ['-fobjc-arc']
 
 apple_library(
-  name = 'CSSLayout',
+  name = 'CSSLayoutKit',
   compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
-  tests = [':CSSLayoutTests'],
+  tests = [':CSSLayoutKitTests'],
   srcs = glob(['*.m']),
   exported_headers = glob(['*.h']),
   frameworks = [
@@ -26,7 +26,7 @@ apple_library(
 )
 
 apple_test(
-  name = 'CSSLayoutTests',
+  name = 'CSSLayoutKitTests',
   compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
   info_plist = 'Tests/Info.plist',
   srcs = glob(['Tests/**/*.m']),
@@ -35,7 +35,7 @@ apple_test(
     '$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework',
   ],
   deps = [
-    ':CSSLayout',
+    ':CSSLayoutKit',
   ],
   visibility = ['PUBLIC'],
 )
diff --git a/uikit/CSSLayout/Tests/CSSLayoutTests.m b/CSSLayoutKit/Tests/CSSLayoutTests.m
similarity index 100%
rename from uikit/CSSLayout/Tests/CSSLayoutTests.m
rename to CSSLayoutKit/Tests/CSSLayoutTests.m
diff --git a/uikit/CSSLayout/Tests/Info.plist b/CSSLayoutKit/Tests/Info.plist
similarity index 100%
rename from uikit/CSSLayout/Tests/Info.plist
rename to CSSLayoutKit/Tests/Info.plist
diff --git a/uikit/CSSLayout/UIView+CSSLayout.h b/CSSLayoutKit/UIView+CSSLayout.h
similarity index 100%
rename from uikit/CSSLayout/UIView+CSSLayout.h
rename to CSSLayoutKit/UIView+CSSLayout.h
diff --git a/uikit/CSSLayout/UIView+CSSLayout.m b/CSSLayoutKit/UIView+CSSLayout.m
similarity index 100%
rename from uikit/CSSLayout/UIView+CSSLayout.m
rename to CSSLayoutKit/UIView+CSSLayout.m
diff --git a/README.md b/README.md
index fb1f8b45..2b9c9f55 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ root.getLayoutHeight();
 ```
 
 ### UIKit
-The full API can be found in `uikit/CSSLayout/UIView+CSSLayout.h`.
+The full API can be found in `CSSLayoutKit/UIView+CSSLayout.h`.
 
 ```objective-c
 UIView *root = [UIView new];