diff --git a/src/core/window-private.h b/src/core/window-private.h
index 5d6ce4067..6c79bbdd0 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -592,7 +592,7 @@ void        meta_window_get_gravity_position (MetaWindow  *window,
 /* Get geometry for saving in the session; x/y are gravity
  * position, and w/h are in resize inc above the base size.
  */
-void        meta_window_get_geometry         (MetaWindow  *window,
+void        meta_window_get_session_geometry (MetaWindow  *window,
                                               int         *x,
                                               int         *y,
                                               int         *width,
diff --git a/src/core/window.c b/src/core/window.c
index deefa7593..6100640ee 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4091,11 +4091,11 @@ meta_window_get_gravity_position (MetaWindow  *window,
 }
 
 void
-meta_window_get_geometry (MetaWindow  *window,
-                          int         *x,
-                          int         *y,
-                          int         *width,
-                          int         *height)
+meta_window_get_session_geometry (MetaWindow  *window,
+                                  int         *x,
+                                  int         *y,
+                                  int         *width,
+                                  int         *height)
 {
   meta_window_get_gravity_position (window,
                                     window->size_hints.win_gravity,
diff --git a/src/x11/session.c b/src/x11/session.c
index f52804901..d9c7b9d55 100644
--- a/src/x11/session.c
+++ b/src/x11/session.c
@@ -974,7 +974,7 @@ save_state (void)
           /* Gravity */
           {
             int x, y, w, h;
-            meta_window_get_geometry (window, &x, &y, &w, &h);
+            meta_window_get_session_geometry (window, &x, &y, &w, &h);
 
             fprintf (outfile,
                      "    <geometry x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" gravity=\"%s\"/>\n",