diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h
index 79dd1880..96e2e68d 100644
--- a/include/GL/glfw3.h
+++ b/include/GL/glfw3.h
@@ -517,8 +517,8 @@ GLFWAPI void glfwCloseWindow(GLFWwindow window);
 GLFWAPI void glfwSetWindowTitle(GLFWwindow, const char* title);
 GLFWAPI void glfwGetWindowSize(GLFWwindow, int* width, int* height);
 GLFWAPI void glfwSetWindowSize(GLFWwindow, int width, int height);
-GLFWAPI void glfwGetWindowPos(GLFWwindow, int* x, int* y);
-GLFWAPI void glfwSetWindowPos(GLFWwindow, int x, int y);
+GLFWAPI void glfwGetWindowPos(GLFWwindow, int* xpos, int* ypos);
+GLFWAPI void glfwSetWindowPos(GLFWwindow, int xpos, int ypos);
 GLFWAPI void glfwIconifyWindow(GLFWwindow window);
 GLFWAPI void glfwRestoreWindow(GLFWwindow window);
 GLFWAPI int  glfwGetWindowParam(GLFWwindow window, int param);
@@ -539,7 +539,7 @@ GLFWAPI int  glfwGetKey(GLFWwindow window, int key);
 GLFWAPI int  glfwGetMouseButton(GLFWwindow window, int button);
 GLFWAPI void glfwGetMousePos(GLFWwindow window, int* xpos, int* ypos);
 GLFWAPI void glfwSetMousePos(GLFWwindow window, int xpos, int ypos);
-GLFWAPI void glfwGetScrollOffset(GLFWwindow window, int* x, int* y);
+GLFWAPI void glfwGetScrollOffset(GLFWwindow window, int* xoffset, int* yoffset);
 GLFWAPI void glfwSetKeyCallback(GLFWkeyfun cbfun);
 GLFWAPI void glfwSetCharCallback(GLFWcharfun cbfun);
 GLFWAPI void glfwSetMouseButtonCallback(GLFWmousebuttonfun cbfun);
diff --git a/src/input.c b/src/input.c
index 49177954..482b111f 100644
--- a/src/input.c
+++ b/src/input.c
@@ -159,7 +159,7 @@ GLFWAPI void glfwSetMousePos(GLFWwindow handle, int xpos, int ypos)
 // Returns the scroll offset for the specified window
 //========================================================================
 
-GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* x, int* y)
+GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* xoffset, int* yoffset)
 {
     if (!_glfwInitialized)
     {
@@ -169,11 +169,11 @@ GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* x, int* y)
 
     _GLFWwindow* window = (_GLFWwindow*) handle;
 
-    if (x)
-      *x = window->scrollX;
+    if (xoffset)
+      *xoffset = window->scrollX;
 
-    if (y)
-      *y = window->scrollY;
+    if (yoffset)
+      *yoffset = window->scrollY;
 }
 
 
diff --git a/src/window.c b/src/window.c
index 385595ce..dba41e40 100644
--- a/src/window.c
+++ b/src/window.c
@@ -186,13 +186,13 @@ void _glfwInputChar(_GLFWwindow* window, int character)
 // Register scroll events
 //========================================================================
 
-void _glfwInputScroll(_GLFWwindow* window, int x, int y)
+void _glfwInputScroll(_GLFWwindow* window, int xoffset, int yoffset)
 {
-    window->scrollX += x;
-    window->scrollY += y;
+    window->scrollX += xoffset;
+    window->scrollY += yoffset;
 
     if (_glfwLibrary.scrollCallback)
-        _glfwLibrary.scrollCallback(window, x, y);
+        _glfwLibrary.scrollCallback(window, xoffset, yoffset);
 }
 
 
@@ -896,7 +896,7 @@ GLFWAPI void glfwSetWindowSize(GLFWwindow handle, int width, int height)
 // Get the window position
 //========================================================================
 
-GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
+GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* xpos, int* ypos)
 {
     if (!_glfwInitialized)
     {
@@ -906,11 +906,11 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
 
     _GLFWwindow* window = (_GLFWwindow*) handle;
 
-    if (x != NULL)
-        *x = window->positionX;
+    if (xpos != NULL)
+        *xpos = window->positionX;
 
-    if (y != NULL)
-        *y = window->positionY;
+    if (ypos != NULL)
+        *ypos = window->positionY;
 }
 
 
@@ -918,7 +918,7 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
 // Set the window position
 //========================================================================
 
-GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int x, int y)
+GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int xpos, int ypos)
 {
     if (!_glfwInitialized)
     {
@@ -934,7 +934,7 @@ GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int x, int y)
         return;
     }
 
-    _glfwPlatformSetWindowPos(window, x, y);
+    _glfwPlatformSetWindowPos(window, xpos, ypos);
 }