diff --git a/libgpaste/keybinder/gpaste-show-history-keybinding.c b/libgpaste/keybinder/gpaste-show-history-keybinding.c
index b278b5c81..12dbbbab3 100644
--- a/libgpaste/keybinder/gpaste-show-history-keybinding.c
+++ b/libgpaste/keybinder/gpaste-show-history-keybinding.c
@@ -33,9 +33,9 @@ g_paste_show_history_keybinding_init (GPasteShowHistoryKeybinding *self G_GNUC_U
 }
 
 static void
-g_paste_show_history_keybinding_show_history (GPasteDaemon *daemon)
+g_paste_show_history_keybinding_show_history (GPasteDaemon *gpaste_daemon)
 {
-    g_paste_daemon_show_history (daemon,
+    g_paste_daemon_show_history (gpaste_daemon,
                                  NULL); /* error */
 }
 
@@ -43,7 +43,7 @@ g_paste_show_history_keybinding_show_history (GPasteDaemon *daemon)
  * g_paste_show_history_keybinding_new:
  * @xcb_wrapper: a #GPasteXcbWrapper instance
  * @settings: a #GPasteSettings instance
- * @daemon: a #GPasteDaemon instance
+ * @gpaste_daemon: a #GPasteDaemon instance
  *
  * Create a new instance of #GPasteShowHistoryKeybinding
  *
@@ -53,11 +53,11 @@ g_paste_show_history_keybinding_show_history (GPasteDaemon *daemon)
 G_PASTE_VISIBLE GPasteShowHistoryKeybinding *
 g_paste_show_history_keybinding_new (GPasteXcbWrapper *xcb_wrapper,
                                      GPasteSettings   *settings,
-                                     GPasteDaemon     *daemon)
+                                     GPasteDaemon     *gpaste_daemon)
 {
     g_return_val_if_fail (G_PASTE_IS_XCB_WRAPPER (xcb_wrapper), NULL);
     g_return_val_if_fail (G_PASTE_IS_SETTINGS (settings), NULL);
-    g_return_val_if_fail (G_PASTE_IS_DAEMON (daemon), NULL);
+    g_return_val_if_fail (G_PASTE_IS_DAEMON (gpaste_daemon), NULL);
 
     return G_PASTE_SHOW_HISTORY_KEYBINDING (_g_paste_keybinding_new (G_PASTE_TYPE_SHOW_HISTORY_KEYBINDING,
                                                                      xcb_wrapper,
@@ -65,5 +65,5 @@ g_paste_show_history_keybinding_new (GPasteXcbWrapper *xcb_wrapper,
                                                                      SHOW_HISTORY_KEY,
                                                                      g_paste_settings_get_show_history,
                                                                      (GPasteKeybindingFunc) g_paste_show_history_keybinding_show_history,
-                                                                     daemon));
+                                                                     gpaste_daemon));
 }
diff --git a/libgpaste/keybinder/gpaste-show-history-keybinding.h b/libgpaste/keybinder/gpaste-show-history-keybinding.h
index 245f624c5..58d2f5000 100644
--- a/libgpaste/keybinder/gpaste-show-history-keybinding.h
+++ b/libgpaste/keybinder/gpaste-show-history-keybinding.h
@@ -51,7 +51,7 @@ GType g_paste_show_history_keybinding_get_type (void);
 
 GPasteShowHistoryKeybinding *g_paste_show_history_keybinding_new (GPasteXcbWrapper *xcb_wrapper,
                                                                   GPasteSettings   *settings,
-                                                                  GPasteDaemon     *daemon);
+                                                                  GPasteDaemon     *gpaste_daemon);
 
 G_END_DECLS