diff --git a/include/SDL_video.h b/include/SDL_video.h
index 31cb4c32a..bb2d6d9d8 100644
--- a/include/SDL_video.h
+++ b/include/SDL_video.h
@@ -339,7 +339,7 @@ extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayI
  *  \return the display index of the display containing the center of the
  *          window, or -1 on error.
  */
-extern DECLSPEC int SDLCALL SDL_GetWindowDisplay(SDL_Window * window);
+extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window);
 
 /**
  *  \brief Set the display mode used when a fullscreen window is visible.
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 1a094235b..598f518e2 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -914,7 +914,7 @@ SDL_SetDisplayModeForDisplay(SDL_VideoDisplay * display, const SDL_DisplayMode *
 }
 
 int
-SDL_GetWindowDisplay(SDL_Window * window)
+SDL_GetWindowDisplayIndex(SDL_Window * window)
 {
     int displayIndex;
     int i, dist;
@@ -976,7 +976,7 @@ SDL_GetWindowDisplay(SDL_Window * window)
 SDL_VideoDisplay *
 SDL_GetDisplayForWindow(SDL_Window *window)
 {
-    int displayIndex = SDL_GetWindowDisplay(window);
+    int displayIndex = SDL_GetWindowDisplayIndex(window);
     if (displayIndex >= 0) {
         return &_this->displays[displayIndex];
     } else {
diff --git a/test/testwm2.c b/test/testwm2.c
index 75de8f9bf..48a57e8ee 100644
--- a/test/testwm2.c
+++ b/test/testwm2.c
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
                             event.window.windowID,
                             event.window.data1,
                             event.window.data2,
-                            SDL_GetWindowDisplay(window));
+                            SDL_GetWindowDisplayIndex(window));
                     }
                 }
             }