diff --git a/gnucash/register/register-gnome/combocell-gnome.c b/gnucash/register/register-gnome/combocell-gnome.c
index 581f0ecea6..dde6dec59e 100644
--- a/gnucash/register/register-gnome/combocell-gnome.c
+++ b/gnucash/register/register-gnome/combocell-gnome.c
@@ -783,7 +783,7 @@ gnc_combo_cell_gui_move (BasicCell *bcell)
 }
 
 static int
-get_popup_height (G_GNUC_UNUSED GtkWidget *widget,
+popup_get_height (G_GNUC_UNUSED GtkWidget *widget,
                   int space_available,
                   int row_height,
                   gpointer user_data)
@@ -851,7 +851,7 @@ gnc_combo_cell_enter (BasicCell *bcell,
 
     gnc_item_edit_set_popup (box->item_edit,
                              GTK_WIDGET(box->item_list),
-                             get_popup_height, popup_autosize,
+                             popup_get_height, popup_autosize,
                              popup_set_focus, popup_post_show,
                              popup_get_width, box);
 
diff --git a/gnucash/register/register-gnome/datecell-gnome.c b/gnucash/register/register-gnome/datecell-gnome.c
index da6677e6b1..453022b139 100644
--- a/gnucash/register/register-gnome/datecell-gnome.c
+++ b/gnucash/register/register-gnome/datecell-gnome.c
@@ -632,7 +632,7 @@ gnc_date_cell_move (BasicCell *bcell)
 }
 
 static int
-get_popup_height (GtkWidget *widget,
+popup_get_height (GtkWidget *widget,
                   G_GNUC_UNUSED int space_available,
                   G_GNUC_UNUSED int row_height,
                   G_GNUC_UNUSED gpointer user_data)
@@ -665,7 +665,7 @@ gnc_date_cell_enter (BasicCell *bcell,
     PopBox *box = bcell->gui_private;
 
     gnc_item_edit_set_popup (box->item_edit, GTK_WIDGET (box->date_picker),
-                             get_popup_height, NULL, popup_set_focus,
+                             popup_get_height, NULL, popup_set_focus,
                              NULL, NULL, NULL);
 
     block_picker_signals (cell);
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.c b/gnucash/register/register-gnome/gnucash-item-edit.c
index ba249dd265..16d86c8a1a 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.c
+++ b/gnucash/register/register-gnome/gnucash-item-edit.c
@@ -171,7 +171,7 @@ gnc_item_edit_init (GncItemEdit *item_edit)
     item_edit->popup_toggle.signals_connected = FALSE;
 
     item_edit->popup_item = NULL;
-    item_edit->get_popup_height = NULL;
+    item_edit->popup_get_height = NULL;
     item_edit->popup_autosize = NULL;
     item_edit->popup_set_focus = NULL;
     item_edit->popup_post_show = NULL;
@@ -654,8 +654,8 @@ gnc_item_edit_show_popup (GncItemEdit *item_edit)
 
     popup_max_width = view_width - popup_x + x_offset;
 
-    if (item_edit->get_popup_height)
-        popup_h = item_edit->get_popup_height
+    if (item_edit->popup_get_height)
+        popup_h = item_edit->popup_get_height
                        (item_edit->popup_item, popup_h, h,
                         item_edit->popup_user_data);
 
@@ -742,7 +742,7 @@ gnc_item_edit_hide_popup (GncItemEdit *item_edit)
 void
 gnc_item_edit_set_popup (GncItemEdit    *item_edit,
                          GtkWidget      *popup_item,
-                         GetPopupHeight  get_popup_height,
+                         PopupGetHeight  popup_get_height,
                          PopupAutosize   popup_autosize,
                          PopupSetFocus   popup_set_focus,
                          PopupPostShow   popup_post_show,
@@ -757,7 +757,7 @@ gnc_item_edit_set_popup (GncItemEdit    *item_edit,
     item_edit->is_popup = popup_item != NULL;
 
     item_edit->popup_item       = popup_item;
-    item_edit->get_popup_height = get_popup_height;
+    item_edit->popup_get_height = popup_get_height;
     item_edit->popup_autosize   = popup_autosize;
     item_edit->popup_set_focus  = popup_set_focus;
     item_edit->popup_post_show  = popup_post_show;
diff --git a/gnucash/register/register-gnome/gnucash-item-edit.h b/gnucash/register/register-gnome/gnucash-item-edit.h
index d6b7e73369..7b8969a509 100644
--- a/gnucash/register/register-gnome/gnucash-item-edit.h
+++ b/gnucash/register/register-gnome/gnucash-item-edit.h
@@ -38,7 +38,7 @@
 #define GNC_IS_ITEM_EDIT(o)       (G_TYPE_CHECK_INSTANCE_TYPE((o), GNC_TYPE_ITEM_EDIT))
 
 
-typedef int (*GetPopupHeight) (GtkWidget *item,
+typedef int (*PopupGetHeight) (GtkWidget *item,
                                int space_available,
                                int row_height,
                                gpointer user_data);
@@ -79,7 +79,7 @@ typedef struct
 
     PopupToggle popup_toggle;
     GtkWidget *popup_item;
-    GetPopupHeight   get_popup_height;
+    PopupGetHeight   popup_get_height;
     PopupAutosize    popup_autosize;
     PopupSetFocus    popup_set_focus;
     PopupPostShow    popup_post_show;
@@ -110,7 +110,7 @@ GtkWidget *gnc_item_edit_new (GnucashSheet *sheet);
 
 void gnc_item_edit_set_popup (GncItemEdit    *item_edit,
                               GtkWidget      *popup_item,
-                              GetPopupHeight  get_popup_height,
+                              PopupGetHeight  popup_get_height,
                               PopupAutosize   popup_autosize,
                               PopupSetFocus   popup_set_focus,
                               PopupPostShow   popup_post_show,