1 files changed, 8 insertions, 8 deletions
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/include/mbgl/platform/default/glfw_view.hpp
index 6e91c1125e..8ec282891a 100644
--- a/include/mbgl/platform/default/glfw_view.hpp
+++ b/include/mbgl/platform/default/glfw_view.hpp
@@ -16,16 +16,16 @@ public:
 
     void initialize(mbgl::Map *map);
     void swap();
-    void make_active();
-    void make_inactive();
+    void activate();
+    void deactivate();
     void notify();
-    void notify_map_change(mbgl::MapChange change, mbgl::timestamp delay = 0);
+    void notifyMapChange(mbgl::MapChange change, mbgl::timestamp delay = 0);
 
     static void key(GLFWwindow *window, int key, int scancode, int action, int mods);
     static void scroll(GLFWwindow *window, double xoffset, double yoffset);
-    static void resize(GLFWwindow *window, int, int);
-    static void mouseclick(GLFWwindow *window, int button, int action, int modifiers);
-    static void mousemove(GLFWwindow *window, double x, double y);
+    static void resize(GLFWwindow *window, int width, int height);
+    static void mouseClick(GLFWwindow *window, int button, int action, int modifiers);
+    static void mouseMove(GLFWwindow *window, double x, double y);
 
     static void eventloop(void *arg);
 
@@ -35,12 +35,12 @@ public:
 public:
     bool fullscreen = false;
 
-    double last_x = 0, last_y = 0;
+    double lastX = 0, lastY = 0;
     bool tracking = false;
 
     bool rotating = false;
 
-    double last_click = -1;
+    double lastClick = -1;
 
     GLFWwindow *window = nullptr;
 };