diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java
index c78989132..af32c24c1 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEvent.java
@@ -7,50 +7,50 @@ public class MapboxEvent implements Serializable {
     public static final String MGLMapboxEventsAPIBase = "https://api.tiles.mapbox.com";
 
     // Event Types
-    public static final String MAPBOXEVENT_TURNSTILE = "appUserTurnstile";
-    public static final String MAPBOXEVENT_MAP_LOAD = "map.load";
-    public static final String MAPBOXEVENT_MAP_CLICK = "map.click";
-    public static final String MAPBOXEVENT_MAP_DRAGEND = "map.dragend";
-    public static final String MAPBOXEVENT_LOCATION = "location";
-    public static final String MAPBOXEVENT_VISIT = "visit";
+    public static final String TYPE_TURNSTILE = "appUserTurnstile";
+    public static final String TYPE_MAP_LOAD = "map.load";
+    public static final String TYPE_MAP_CLICK = "map.click";
+    public static final String TYPE_MAP_DRAGEND = "map.dragend";
+    public static final String TYPE_LOCATION = "location";
+    public static final String TYPE_VISIT = "visit";
 
     // Event Keys
-    public static final String MGLEventKeyLatitude = "lat";
-    public static final String MGLEventKeyLongitude = "lng";
-    public static final String MGLEventKeySpeed = "speed";
-    public static final String MGLEventKeyCourse = "course";
-    public static final String MGLEventKeyAltitude = "altitude";
-    public static final String MGLEventKeyHorizontalAccuracy = "horizontalAccuracy";
+    public static final String KEY_LATITUDE = "lat";
+    public static final String KEY_LONGITUDE = "lng";
+    public static final String KEY_SPEED = "speed";
+    public static final String KEY_COURSE = "course";
+    public static final String KEY_ALTITUDE = "altitude";
+    public static final String KEY_HORIZONTAL_ACCURACY = "horizontalAccuracy";
 
-    public static final String MGLEventKeyPushEnabled = "enabled.push";
-    public static final String MGLEventKeyEmailEnabled = "enabled.email";
-    public static final String MGLEventKeyGestureID = "gesture";
-    public static final String MGLEventKeyArrivalDate = "arrivalDate";
-    public static final String MGLEventKeyDepartureDate = "departureDate";
+    public static final String KEY_PUSH_ENABLED = "enabled.push";
+    public static final String KEY_EMAIL_ENABLED = "enabled.email";
+    public static final String KEY_GESTURE_ID = "gesture";
+    public static final String KEY_ARRIVAL_DATE = "arrivalDate";
+    public static final String KEY_DEPARTURE_DATE = "departureDate";
 
-    public static final String MGLEventGestureSingleTap = "SingleTap";
-    public static final String MGLEventGestureDoubleTap = "DoubleTap";
-    public static final String MGLEventGestureTwoFingerSingleTap = "TwoFingerTap";
-    public static final String MGLEventGestureQuickZoom = "QuickZoom";
-    public static final String MGLEventGesturePanStart = "Pan";
-    public static final String MGLEventGesturePinchStart = "Pinch";
-    public static final String MGLEventGestureRotateStart = "Rotation";
-    public static final String MGLEventGesturePitchStart = "Pitch";
+    public static final String GESTURE_SINGLETAP = "SingleTap";
+    public static final String GESTURE_DOUBLETAP = "DoubleTap";
+    public static final String GESTURE_TWO_FINGER_SINGLETAP = "TwoFingerTap";
+    public static final String GESTURE_QUICK_ZOOM = "QuickZoom";
+    public static final String GESTURE_PAN_START = "Pan";
+    public static final String GESTURE_PINCH_START = "Pinch";
+    public static final String GESTURE_ROTATION_START = "Rotation";
+    public static final String GESTURE_PITCH_START = "Pitch";
 
     // Event Attributes
-    public static final int VERSION = 1;
-    public static final String CREATED = "created";
-    public static final String INSTANCE = "instance";
-    public static final String VENDORID = "vendorId";
-    public static final String APPBUNDLEID = "appBundleId";
-    public static final String MODEL = "model";
-    public static final String OPERATINGSYSTEM= "operatingSystem";
-    public static final String ORIENTATION = "orientation";
-    public static final String BATTERYLEVEL = "batteryLevel";
-    public static final String APPLICATIONSTATE = "applicationState";
-    public static final String RESOLUTION = "resolution";
-    public static final String ACCESSIBILITYFONTSCALE = "accessibilityFontScale";
-    public static final String CARRIER = "carrier";
-    public static final String CELLULARNETWORKTYPE = "cellularNetworkType";
-    public static final String WIFI = "wifi";
+    public static final int ATTRIBUTE_VERSION = 1;
+    public static final String ATTRIBUTE_CREATED = "created";
+    public static final String ATTRIBUTE_INSTANCE = "instance";
+    public static final String ATTRIBUTE_VENDOR_ID = "vendorId";
+    public static final String ATTRIBUTE_APP_BUNDLE_ID = "appBundleId";
+    public static final String ATTRIBUTE_MODEL = "model";
+    public static final String ATTRIBUTE_OPERATING_SYSTEM= "operatingSystem";
+    public static final String ATTRIBUTE_ORIENTATION = "orientation";
+    public static final String ATTRIBUTE_BATTERY_LEVEL = "batteryLevel";
+    public static final String ATTRIBUTE_APPLICATION_STATE = "applicationState";
+    public static final String ATTRIBUTE_RESOLUTION = "resolution";
+    public static final String ATTRIBUTE_ACCESSIBILITY_FONT_SCALE = "accessibilityFontScale";
+    public static final String ATTRIBUTE_CARRIER = "carrier";
+    public static final String ATTRIBUTE_CELLULAR_NETWORK_TYPE = "cellularNetworkType";
+    public static final String ATTRIBUTE_WIFI = "wifi";
 }
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
index 9bdf092c9..299cd96f4 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/telemetry/MapboxEventManager.java
@@ -77,14 +77,14 @@ public class MapboxEventManager {
     public void addLocationEvent(Location location) {
         // Add Location even to queue
         Hashtable<String, Object> event = new Hashtable<>();
-        event.put(MapboxEvent.MGLEventKeyLatitude, location.getLatitude());
-        event.put(MapboxEvent.MGLEventKeyLongitude, location.getLongitude());
-        event.put(MapboxEvent.MGLEventKeySpeed, location.getSpeed());
-        event.put(MapboxEvent.MGLEventKeyCourse, location.getBearing());
-        event.put(MapboxEvent.MGLEventKeyAltitude, location.getAltitude());
-        event.put(MapboxEvent.MGLEventKeyHorizontalAccuracy, location.getAccuracy());
+        event.put(MapboxEvent.KEY_LATITUDE, location.getLatitude());
+        event.put(MapboxEvent.KEY_LONGITUDE, location.getLongitude());
+        event.put(MapboxEvent.KEY_SPEED, location.getSpeed());
+        event.put(MapboxEvent.KEY_COURSE, location.getBearing());
+        event.put(MapboxEvent.KEY_ALTITUDE, location.getAltitude());
+        event.put(MapboxEvent.KEY_HORIZONTAL_ACCURACY, location.getAccuracy());
         event.put("created", dateFormat.format(new Date()));
-        event.put("event", MapboxEvent.MAPBOXEVENT_LOCATION);
+        event.put("event", MapboxEvent.TYPE_LOCATION);
 
         events.add(event);
 
@@ -115,16 +115,16 @@ public class MapboxEventManager {
 
                 for (Hashtable<String, Object> evt : events) {
                     JSONObject jsonObject = new JSONObject();
-                    jsonObject.put(MapboxEvent.MGLEventKeyLatitude, evt.get(MapboxEvent.MGLEventKeyLatitude));
-                    jsonObject.put(MapboxEvent.MGLEventKeyLongitude, evt.get(MapboxEvent.MGLEventKeyLongitude));
-                    jsonObject.put(MapboxEvent.MGLEventKeySpeed, evt.get(MapboxEvent.MGLEventKeySpeed));
-                    jsonObject.put(MapboxEvent.MGLEventKeyCourse, evt.get(MapboxEvent.MGLEventKeyCourse));
-                    jsonObject.put(MapboxEvent.MGLEventKeyAltitude, evt.get(MapboxEvent.MGLEventKeyAltitude));
-                    jsonObject.put(MapboxEvent.MGLEventKeyHorizontalAccuracy, evt.get(MapboxEvent.MGLEventKeyHorizontalAccuracy));
+                    jsonObject.put(MapboxEvent.KEY_LATITUDE, evt.get(MapboxEvent.KEY_LATITUDE));
+                    jsonObject.put(MapboxEvent.KEY_LONGITUDE, evt.get(MapboxEvent.KEY_LONGITUDE));
+                    jsonObject.put(MapboxEvent.KEY_SPEED, evt.get(MapboxEvent.KEY_SPEED));
+                    jsonObject.put(MapboxEvent.KEY_COURSE, evt.get(MapboxEvent.KEY_COURSE));
+                    jsonObject.put(MapboxEvent.KEY_ALTITUDE, evt.get(MapboxEvent.KEY_ALTITUDE));
+                    jsonObject.put(MapboxEvent.KEY_HORIZONTAL_ACCURACY, evt.get(MapboxEvent.KEY_HORIZONTAL_ACCURACY));
 
                     // Basic Event Meta Data
                     jsonObject.put("event", evt.get("event"));
-                    jsonObject.put("version", MapboxEvent.VERSION);
+                    jsonObject.put("version", MapboxEvent.ATTRIBUTE_VERSION);
                     jsonObject.put("instance", SESSION_UUID);
                     jsonObject.put("created", evt.get("created"));
                     jsonObject.put("appBundleId", context.getPackageName());