diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 79f2b9dd05..ed19c9f70a 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -4287,11 +4287,19 @@ gdk_win32_surface_show_window_menu (GdkSurface *surface,
   return TRUE;
 }
 
+/**
+ * gdk_win32_surface_get_impl_hwnd:
+ * @surface: a `GdkSurface`
+ *
+ * Returns: the associated @surface HWND handle.
+ *
+ * Deprecated: 4.8: Use gdk_win32_surface_get_handle() instead.
+ */
 HWND
-gdk_win32_surface_get_impl_hwnd (GdkSurface *window)
+gdk_win32_surface_get_impl_hwnd (GdkSurface *surface)
 {
-  if (GDK_IS_WIN32_SURFACE (window))
-    return GDK_SURFACE_HWND (window);
+  if (GDK_IS_WIN32_SURFACE (surface))
+    return GDK_SURFACE_HWND (surface);
   return NULL;
 }
 
diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h
index 7497ee593e..990b8d0156 100644
--- a/gdk/win32/gdkwin32misc.h
+++ b/gdk/win32/gdkwin32misc.h
@@ -70,8 +70,8 @@ G_BEGIN_DECLS
 
 GDK_DEPRECATED_IN_4_8_FOR(GDK_IS_WIN32_SURFACE)
 gboolean      gdk_win32_surface_is_win32 (GdkSurface *surface);
-GDK_AVAILABLE_IN_ALL
-HWND          gdk_win32_surface_get_impl_hwnd (GdkSurface *window);
+GDK_DEPRECATED_IN_4_8_FOR(gdk_win32_surface_get_handle)
+HWND          gdk_win32_surface_get_impl_hwnd (GdkSurface *surface);
 
 /* Return the Gdk* for a particular HANDLE */
 GDK_AVAILABLE_IN_ALL