diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index cc78072ff..c21594dba 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -119,7 +119,7 @@
             android:label="@string/activity_minmax_zoom">
             <meta-data
                 android:name="@string/category"
-                android:value="@string/category_other" />
+                android:value="@string/category_camera" />
         </activity>
         <activity
             android:name=".activity.userlocation.MyLocationTrackingModeActivity"
@@ -127,7 +127,7 @@
             android:label="@string/activity_user_tracking_mode">
             <meta-data
                 android:name="@string/category"
-                android:value="@string/category_other" />
+                android:value="@string/category_userlocation" />
         </activity>
         <activity
             android:name=".activity.annotation.PolygonActivity"
@@ -152,7 +152,7 @@
             android:label="@string/activity_directions">
             <meta-data
                 android:name="@string/category"
-                android:value="@string/category_api" />
+                android:value="@string/category_directions" />
         </activity>
         <activity
             android:name=".activity.geocoding.GeocoderActivity"
@@ -160,7 +160,7 @@
             android:label="@string/activity_geocoder">
             <meta-data
                 android:name="@string/category"
-                android:value="@string/category_api" />
+                android:value="@string/category_geocoding" />
         </activity>
         <activity
             android:name=".activity.camera.ScrollByActivity"
@@ -177,7 +177,7 @@
             android:screenOrientation="portrait">
             <meta-data
                 android:name="@string/category"
-                android:value="@string/category_other" />
+                android:value="@string/category_maplayout" />
         </activity>
         <activity
             android:name=".activity.offline.OfflineActivity"
@@ -185,7 +185,7 @@
             android:label="@string/activity_offline">
             <meta-data
                 android:name="@string/category"
-                android:value="@string/category_other" />
+                android:value="@string/category_offline" />
         </activity>
         <activity
             android:name=".activity.imagegenerator.SnapshotActivity"
@@ -193,7 +193,7 @@
             android:label="@string/activity_snapshot">
             <meta-data
                 android:name="@string/category"
-                android:value="@string/category_other" />
+                android:value="@string/category_imagegenerator" />
         </activity>
 
         <!-- Configuration Settings -->
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
index 07e8aae58..fcaa7e709 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/strings.xml
@@ -71,11 +71,15 @@
 
     <string name="category">category</string>
     <string name="category_annotation">Annotation</string>
-    <string name="category_infowindow">InfoWindow</string>
     <string name="category_camera">Camera</string>
+    <string name="category_directions">Directions</string>
     <string name="category_fragment">Fragment</string>
-    <string name="category_api">API</string>
-    <string name="category_other">Other</string>
+    <string name="category_geocoding">Geocoding</string>
+    <string name="category_imagegenerator">Image Generator</string>
+    <string name="category_infowindow">InfoWindow</string>
+    <string name="category_maplayout">Map Layout</string>
+    <string name="category_offline">Offline</string>
+    <string name="category_userlocation">User Location</string>
 
     <string name="action_visible_bounds_explanation">Center map around 2 markers</string>
     <string name="action_remove_polylines">Remove polylines</string>