Rename lots of things

2 files changed, 27 insertions, 27 deletions

diff --git a/include/mbgl/android/jni.hpp b/include/mbgl/android/jni.hpp
index da3f59dae5..31772cf59c 100644
--- a/include/mbgl/android/jni.hpp
+++ b/include/mbgl/android/jni.hpp
@@ -7,32 +7,32 @@
 namespace mbgl {
 namespace android {
 
-extern std::string cache_path;
-extern std::string data_path;
-extern std::string apk_path;
+extern std::string cachePath;
+extern std::string dataPath;
+extern std::string apkPath;
 
-extern jmethodID on_map_changed_id;
-extern jmethodID on_fps_changed_id;
+extern jmethodID onMapChangedId;
+extern jmethodID onFpsChangedId;
 
-extern jclass lon_lat_class;
-extern jmethodID lon_lat_constructor_id;
-extern jfieldID lon_lat_lon_id;
-extern jfieldID lon_lat_lat_id;
+extern jclass lonLatClass;
+extern jmethodID lonLatConstructorId;
+extern jfieldID lonLatLonId;
+extern jfieldID lonLatLatId;
 
-extern jclass lon_lat_zoom_class;
-extern jmethodID lon_lat_zoom_constructor_id;
-extern jfieldID lon_lat_zoom_lon_id;
-extern jfieldID lon_lat_zoom_lat_id;
-extern jfieldID lon_lat_zoom_zoom_id;
+extern jclass lonLatZoomClass;
+extern jmethodID lonLatZoomConstructorId;
+extern jfieldID lonLatZoomLonId;
+extern jfieldID lonLatZoomLatId;
+extern jfieldID lonLatZoomZoomId;
 
-extern jclass runtime_exception_class;
-extern jclass null_pointer_exception_class;;
+extern jclass runtimeExceptionClass;
+extern jclass nullPointerExceptionClass;;
 
-extern jmethodID list_to_array_id;
+extern jmethodID listToArrayId;
 
-extern jclass array_list_class;
-extern jmethodID array_list_constructor_id;
-extern jmethodID array_list_add_id;
+extern jclass arrayListClass;
+extern jmethodID arrayListConstructorId;
+extern jmethodID arrayListAddId;
 
 }
 }
diff --git a/include/mbgl/android/native_map_view.hpp b/include/mbgl/android/native_map_view.hpp
index 4752d18625..bfcd87675b 100644
--- a/include/mbgl/android/native_map_view.hpp
+++ b/include/mbgl/android/native_map_view.hpp
@@ -55,7 +55,7 @@ public:
     void stop();
 
     void resume();
-    void pause(bool wait_for_pause = false);
+    void pause(bool waitForPause = false);
 
     void notifyMapChange();
 
@@ -63,7 +63,7 @@ public:
     void updateFps();
 
 private:
-    EGLConfig chooseConfig(const EGLConfig configs[], EGLint num_configs);
+    EGLConfig chooseConfig(const EGLConfig configs[], EGLint numConfigs);
 
     void loadExtensions();
 
@@ -83,14 +83,14 @@ private:
     EGLConfig config = nullptr;
     EGLint format = -1;
 
-    std::string style_url;
-    std::string api_key;
+    std::string styleUrl;
+    std::string apiKey;
 
-    bool first_time = false;
+    bool firstTime = false;
 
-    bool using_depth24 = false;
+    bool usingDepth24 = false;
 
-    bool fps_enabled = false;
+    bool fpsEnabled = false;
     double fps = 0.0;
 };