Prefix library resources to avoid naming conflicts (#6878)

* [android] - add library resource prefix

* update SDK resources with prefix

* fixup tests

25 files changed, 97 insertions, 97 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
index 086b18fea1..9cb9f4dbd6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_add_sprite.xml
@@ -16,10 +16,10 @@
         android:id="@id/mapView"
         android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        app:center_latitude="52.519003"
-        app:center_longitude="13.400972"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="16"
+        app:mapbox_center_latitude="52.519003"
+        app:mapbox_center_longitude="13.400972"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="16"
         android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
index eabfc30b25..8ac30bcf2b 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_animated_marker.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:center_latitude="51.502615"
-        app:center_longitude="4.972326"
-        app:style_url="@string/style_light"
-        app:zoom="6" />
+        app:mapbox_center_latitude="51.502615"
+        app:mapbox_center_longitude="4.972326"
+        app:mapbox_style_url="@string/mapbox_style_light"
+        app:mapbox_zoom="6" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
index 5a5fb5f604..ba1f4c17df 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_animation_types.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/toolbar"
-        app:center_latitude="51.50325"
-        app:center_longitude="-0.11968"
-        app:zoom="15" />
+        app:mapbox_center_latitude="51.50325"
+        app:mapbox_center_longitude="-0.11968"
+        app:mapbox_zoom="15" />
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
index 2e08f79e95..0cded42204 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_camera_position.xml
@@ -21,7 +21,7 @@
             android:id="@id/mapView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:style_url="@string/style_mapbox_streets" />
+            app:mapbox_style_url="@string/mapbox_style_mapbox_streets" />
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml
index c61055ee4e..5af41a0ab7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_car_driving.xml
@@ -16,9 +16,9 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:my_location_foreground_tint="@color/primary"
-        app:my_location_accuracy_tint="@color/primary"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="15" />
+        app:mapbox_my_location_foreground_tint="@color/primary"
+        app:mapbox_my_location_accuracy_tint="@color/primary"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="15" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml
index 086b18fea1..9cb9f4dbd6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_circlelayer.xml
@@ -16,10 +16,10 @@
         android:id="@id/mapView"
         android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        app:center_latitude="52.519003"
-        app:center_longitude="13.400972"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="16"
+        app:mapbox_center_latitude="52.519003"
+        app:mapbox_center_longitude="13.400972"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="16"
         android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml
index 5de3651272..ba3c5fbd30 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_directions.xml
@@ -16,6 +16,6 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:style_url="@string/style_mapbox_streets" />
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
index d6507559ec..ec622e48cc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_dynamic_marker.xml
@@ -26,12 +26,12 @@
                 android:id="@id/mapView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:center_latitude="51.506675"
-                app:center_longitude="-0.128699"
-                app:compass_fade_facing_north="false"
-                app:direction="90"
-                app:tilt="40"
-                app:zoom="10" />
+                app:mapbox_center_latitude="51.506675"
+                app:mapbox_center_longitude="-0.128699"
+                app:mapbox_compass_fade_facing_north="false"
+                app:mapbox_direction="90"
+                app:mapbox_tilt="40"
+                app:mapbox_zoom="10" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml
index 002ece58bf..256f94fa99 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_geocoder.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="5"
-        app:center_latitude="38.90962"
-        app:center_longitude="-77.04341"
-        app:zoom="15" />
+        app:mapbox_center_latitude="38.90962"
+        app:mapbox_center_longitude="-77.04341"
+        app:mapbox_zoom="15" />
 
     <TextView
         android:id="@+id/message"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
index e69983941a..97f4e01e54 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow.xml
@@ -16,9 +16,9 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:center_latitude="38.897705003219784"
-        app:center_longitude="-77.03655168667463"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="15" />
+        app:mapbox_center_latitude="38.897705003219784"
+        app:mapbox_center_longitude="-77.03655168667463"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="15" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
index dde63c8420..a41063f285 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter.xml
@@ -16,9 +16,9 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:center_latitude="47.798202"
-        app:center_longitude="7.573781"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="4" />
+        app:mapbox_center_latitude="47.798202"
+        app:mapbox_center_longitude="7.573781"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="4" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml
index dde63c8420..a41063f285 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_infowindow_adapter_dynamic.xml
@@ -16,9 +16,9 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:center_latitude="47.798202"
-        app:center_longitude="7.573781"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="4" />
+        app:mapbox_center_latitude="47.798202"
+        app:mapbox_center_longitude="7.573781"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="4" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
index c1f09a36d0..7dfdd5da06 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_manual_zoom.xml
@@ -14,10 +14,10 @@
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@id/mapView"
-        app:center_latitude="50.871062"
-        app:center_longitude="1.583210"
-        app:direction="220"
-        app:zoom="10"
+        app:mapbox_center_latitude="50.871062"
+        app:mapbox_center_longitude="1.583210"
+        app:mapbox_direction="220"
+        app:mapbox_zoom="10"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar" />
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
index 90cb1a90b3..4b2b7385b1 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_bulk.xml
@@ -22,11 +22,11 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:center_latitude="38.87031"
+        app:mapbox_center_latitude="38.87031"
         android:layout_below="@id/toolbar"
-        app:center_longitude="-77.00897"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="10" />
+        app:mapbox_center_longitude="-77.00897"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="10" />
 
     <TextView
         android:id="@+id/countView"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
index 5d285958f1..6a292a4e83 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view.xml
@@ -16,10 +16,10 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        app:center_latitude="38.907192"
-        app:center_longitude="-77.036871"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="12" />
+        app:mapbox_center_latitude="38.907192"
+        app:mapbox_center_longitude="-77.036871"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="12" />
 
     <TextView
         android:id="@+id/countView"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml
index c59f41539c..11cb2ca984 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_marker_view_scale.xml
@@ -52,9 +52,9 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        app:center_latitude="38.907192"
-        app:center_longitude="-77.036871"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="12" />
+        app:mapbox_center_latitude="38.907192"
+        app:mapbox_center_longitude="-77.036871"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="12" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
index 951344e35a..1e31e9cc4f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_maxmin_zoom.xml
@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:center_latitude="-1.063510"
-        app:center_longitude=" 32.895425"
-        app:style_url="@string/style_satellite_streets"
-        app:zoom="4" />
+        app:mapbox_center_latitude="-1.063510"
+        app:mapbox_center_longitude=" 32.895425"
+        app:mapbox_style_url="@string/mapbox_style_satellite_streets"
+        app:mapbox_zoom="4" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
index 19c30dbb8d..586af46e8a 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_my_location_tracking.xml
@@ -42,9 +42,9 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:my_location_foreground_tint="@color/primary"
-        app:my_location_accuracy_tint="@color/primary"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="15" />
+        app:mapbox_my_location_foreground_tint="@color/primary"
+        app:mapbox_my_location_accuracy_tint="@color/primary"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="15" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
index 9e2f875192..61caaef04e 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_polyline.xml
@@ -17,11 +17,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/toolbar"
-        app:attribution_tint="@android:color/holo_green_dark"
-        app:center_latitude="47.798202"
-        app:center_longitude="7.573781"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="4" />
+        app:mapbox_attribution_tint="@android:color/holo_green_dark"
+        app:mapbox_center_latitude="47.798202"
+        app:mapbox_center_longitude="7.573781"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="4" />
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
index 9ff79686d2..36c8a8c476 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_press_for_marker.xml
@@ -17,12 +17,12 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:attribution_gravity="top|end"
-        app:center_latitude="45.1855569"
-        app:center_longitude="5.7215506"
-        app:logo_gravity="top|end"
-        app:logo_margin_right="10dp"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="11" />
+        app:mapbox_attribution_gravity="top|end"
+        app:mapbox_center_latitude="45.1855569"
+        app:mapbox_center_longitude="5.7215506"
+        app:mapbox_logo_gravity="top|end"
+        app:mapbox_logo_margin_right="10dp"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="11" />
 
 </RelativeLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
index c5bb8d71b3..e1931585bc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_scroll_by.xml
@@ -80,10 +80,10 @@
                 android:id="@id/mapView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:center_latitude="37.176546"
-                app:center_longitude="-3.599007"
-                app:style_url="@string/style_emerald"
-                app:zoom="15" />
+                app:mapbox_center_latitude="37.176546"
+                app:mapbox_center_longitude="-3.599007"
+                app:mapbox_style_url="@string/mapbox_style_emerald"
+                app:mapbox_zoom="15" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fab"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
index 086b18fea1..9cb9f4dbd6 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_style_file.xml
@@ -16,10 +16,10 @@
         android:id="@id/mapView"
         android:layout_below="@id/toolbar"
         android:layout_width="match_parent"
-        app:center_latitude="52.519003"
-        app:center_longitude="13.400972"
-        app:style_url="@string/style_mapbox_streets"
-        app:zoom="16"
+        app:mapbox_center_latitude="52.519003"
+        app:mapbox_center_longitude="13.400972"
+        app:mapbox_style_url="@string/mapbox_style_mapbox_streets"
+        app:mapbox_zoom="16"
         android:layout_height="match_parent"/>
 
     <android.support.design.widget.FloatingActionButton
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml
index 8fa94041ff..2d18e4cda3 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_surfaceview_mediacontrols.xml
@@ -17,7 +17,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/toolbar"
-        app:style_url="@string/style_light" />
+        app:mapbox_style_url="@string/mapbox_style_light" />
 
     <FrameLayout
         android:id="@+id/container"
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml
index 979b30d2b4..6c8df08a20 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_video_view.xml
@@ -27,11 +27,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/toolbar"
-        mapbox:attribution_gravity="top"
-        mapbox:center_latitude="34.4021"
-        mapbox:center_longitude="-119.7081"
-        mapbox:logo_gravity="top"
-        mapbox:style_url="mapbox://styles/mapbox/streets-v9"
-        mapbox:zoom="13" />
+        mapbox:mapbox_attribution_gravity="top"
+        mapbox:mapbox_center_latitude="34.4021"
+        mapbox:mapbox_center_longitude="-119.7081"
+        mapbox:mapbox_logo_gravity="top"
+        mapbox:mapbox_style_url="mapbox://styles/mapbox/streets-v9"
+        mapbox:mapbox_zoom="13" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
index 51ec3c4677..afdd6f38f7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_dialog_map.xml
@@ -10,9 +10,9 @@
         android:id="@+id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        mapbox:center_latitude="47.6077"
-        mapbox:center_longitude="-122.3421"
-        mapbox:style_url="mapbox://styles/mapbox/streets-v9"
-        mapbox:zoom="11"/>
+        mapbox:mapbox_center_latitude="47.6077"
+        mapbox:mapbox_center_longitude="-122.3421"
+        mapbox:mapbox_style_url="mapbox://styles/mapbox/streets-v9"
+        mapbox:mapbox_zoom="11"/>
 
 </LinearLayout>
\ No newline at end of file