diff --git a/android/java/lib/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle
similarity index 100%
rename from android/java/lib/build.gradle
rename to android/java/MapboxGLAndroidSDK/build.gradle
diff --git a/android/java/lib/gradle.properties b/android/java/MapboxGLAndroidSDK/gradle.properties
similarity index 100%
rename from android/java/lib/gradle.properties
rename to android/java/MapboxGLAndroidSDK/gradle.properties
diff --git a/android/java/lib/lint.xml b/android/java/MapboxGLAndroidSDK/lint.xml
similarity index 100%
rename from android/java/lib/lint.xml
rename to android/java/MapboxGLAndroidSDK/lint.xml
diff --git a/android/java/lib/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
similarity index 100%
rename from android/java/lib/src/main/AndroidManifest.xml
rename to android/java/MapboxGLAndroidSDK/src/main/AndroidManifest.xml
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/BaseGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/MoveGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/RotateGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/ShoveGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/TwoFingerGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/BaseGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/MoveGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/RotateGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/ShoveGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java
similarity index 100%
rename from android/java/lib/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/almeros/android/multitouch/gesturedetectors/TwoFingerGestureDetector.java
diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java
similarity index 100%
rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLat.java
diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java
similarity index 100%
rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/LonLatZoom.java
diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
similarity index 100%
rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java
similarity index 100%
rename from android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java
rename to android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/lib/NativeMapView.java
diff --git a/android/java/lib/src/main/res/values/attrs.xml b/android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
similarity index 100%
rename from android/java/lib/src/main/res/values/attrs.xml
rename to android/java/MapboxGLAndroidSDK/src/main/res/values/attrs.xml
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index c1dd00a52..564b94bbf 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -71,7 +71,7 @@ android {
 }
 
 dependencies {
-    compile(project(':lib')) {
+    compile(project(':MapboxGLAndroidSDK')) {
         transitive = true
     }
     compile 'com.android.support:support-annotations:21.0.0'
diff --git a/android/java/settings.gradle b/android/java/settings.gradle
index 9738fefb9..62a6aeed9 100644
--- a/android/java/settings.gradle
+++ b/android/java/settings.gradle
@@ -1,2 +1,2 @@
 include ':MapboxGLAndroidSDKTestApp'
-include ':lib'
+include ':MapboxGLAndroidSDK'