diff --git a/lib/widget/button.c b/lib/widget/button.c
index e0d674366..49d514e88 100644
--- a/lib/widget/button.c
+++ b/lib/widget/button.c
@@ -173,7 +173,7 @@ button_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/buttonbar.c b/lib/widget/buttonbar.c
index c2903a9fd..bbfd118ab 100644
--- a/lib/widget/buttonbar.c
+++ b/lib/widget/buttonbar.c
@@ -209,7 +209,7 @@ buttonbar_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, voi
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/check.c b/lib/widget/check.c
index 749a03740..e3e4c991e 100644
--- a/lib/widget/check.c
+++ b/lib/widget/check.c
@@ -99,7 +99,7 @@ check_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/dialog.c b/lib/widget/dialog.c
index 62fbe9216..afc40cbf4 100644
--- a/lib/widget/dialog.c
+++ b/lib/widget/dialog.c
@@ -600,7 +600,7 @@ draw_box (const Dlg_head * h, int y, int x, int ys, int xs, gboolean single)
 
 /** Clean the dialog area, draw the frame and the title */
 void
-common_dialog_repaint (Dlg_head * h)
+dlg_default_repaint (Dlg_head * h)
 {
     Widget *wh = WIDGET (h);
 
@@ -734,7 +734,7 @@ dlg_set_size (Dlg_head * h, int lines, int cols)
 /** Default dialog callback */
 
 cb_ret_t
-default_dlg_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
+dlg_default_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
 {
     (void) sender;
     (void) parm;
@@ -745,7 +745,7 @@ default_dlg_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
     case DLG_DRAW:
         if (h->color != NULL)
         {
-            common_dialog_repaint (h);
+            dlg_default_repaint (h);
             return MSG_HANDLED;
         }
         return MSG_NOT_HANDLED;
@@ -790,7 +790,7 @@ create_dlg (gboolean modal, int y1, int x1, int lines, int cols,
     if (colors != NULL)
         memmove (new_d->color, colors, sizeof (dlg_colors_t));
     new_d->help_ctx = help_ctx;
-    new_d->callback = (callback != NULL) ? callback : default_dlg_callback;
+    new_d->callback = (callback != NULL) ? callback : dlg_default_callback;
     new_d->flags = flags;
     new_d->data = NULL;
 
diff --git a/lib/widget/dialog.h b/lib/widget/dialog.h
index 5308f6b73..ea9144cc3 100644
--- a/lib/widget/dialog.h
+++ b/lib/widget/dialog.h
@@ -186,10 +186,10 @@ void dlg_redraw (Dlg_head * h);
 void dlg_broadcast_msg (Dlg_head * h, widget_msg_t message);
 
 /* Default callback for dialogs */
-cb_ret_t default_dlg_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data);
+cb_ret_t dlg_default_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data);
 
 /* Default paint routine for dialogs */
-void common_dialog_repaint (Dlg_head * h);
+void dlg_default_repaint (Dlg_head * h);
 
 void dlg_replace_widget (Widget * old, Widget * new);
 int dlg_overlap (Widget * a, Widget * b);
diff --git a/lib/widget/gauge.c b/lib/widget/gauge.c
index b1728b16b..b35bfa743 100644
--- a/lib/widget/gauge.c
+++ b/lib/widget/gauge.c
@@ -118,7 +118,7 @@ gauge_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
     }
 
-    return default_widget_callback (sender, msg, parm, data);
+    return widget_default_callback (sender, msg, parm, data);
 }
 
 /* --------------------------------------------------------------------------------------------- */
diff --git a/lib/widget/groupbox.c b/lib/widget/groupbox.c
index 96c67e539..498f35d3d 100644
--- a/lib/widget/groupbox.c
+++ b/lib/widget/groupbox.c
@@ -87,7 +87,7 @@ groupbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/history.c b/lib/widget/history.c
index df5b55c90..4963fb2bf 100644
--- a/lib/widget/history.c
+++ b/lib/widget/history.c
@@ -125,7 +125,7 @@ history_dlg_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
         return history_dlg_reposition (h);
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/hline.c b/lib/widget/hline.c
index 390f2669e..9721c5180 100644
--- a/lib/widget/hline.c
+++ b/lib/widget/hline.c
@@ -101,7 +101,7 @@ hline_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/input.c b/lib/widget/input.c
index 58d4a9ab7..d5e4680be 100644
--- a/lib/widget/input.c
+++ b/lib/widget/input.c
@@ -1119,7 +1119,7 @@ input_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/input_complete.c b/lib/widget/input_complete.c
index be67e1739..bf145e70f 100644
--- a/lib/widget/input_complete.c
+++ b/lib/widget/input_complete.c
@@ -1217,7 +1217,7 @@ query_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *da
         break;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/label.c b/lib/widget/label.c
index 6b84ea96a..24a992e8e 100644
--- a/lib/widget/label.c
+++ b/lib/widget/label.c
@@ -121,7 +121,7 @@ label_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/listbox.c b/lib/widget/listbox.c
index d0ea6b677..4b3dce779 100644
--- a/lib/widget/listbox.c
+++ b/lib/widget/listbox.c
@@ -432,7 +432,7 @@ listbox_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/menu.c b/lib/widget/menu.c
index af1ea109e..2b3437317 100644
--- a/lib/widget/menu.c
+++ b/lib/widget/menu.c
@@ -597,7 +597,7 @@ menubar_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/radio.c b/lib/widget/radio.c
index 548236382..58cd8a801 100644
--- a/lib/widget/radio.c
+++ b/lib/widget/radio.c
@@ -138,7 +138,7 @@ radio_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/lib/widget/widget-common.c b/lib/widget/widget-common.c
index 4f0c3a8c6..9db0d39fe 100644
--- a/lib/widget/widget-common.c
+++ b/lib/widget/widget-common.c
@@ -158,7 +158,7 @@ init_widget (Widget * w, int y, int x, int lines, int cols,
 
 /* Default callback for widgets */
 cb_ret_t
-default_widget_callback (Widget * sender, widget_msg_t msg, int parm, void *data)
+widget_default_callback (Widget * sender, widget_msg_t msg, int parm, void *data)
 {
     (void) sender;
     (void) parm;
diff --git a/lib/widget/widget-common.h b/lib/widget/widget-common.h
index 8b276adf8..acdbc11b4 100644
--- a/lib/widget/widget-common.h
+++ b/lib/widget/widget-common.h
@@ -127,7 +127,7 @@ void hotkey_draw (struct Widget *w, const hotkey_t hotkey, gboolean focused);
 void init_widget (Widget * w, int y, int x, int lines, int cols,
                   widget_cb_fn callback, mouse_h mouse_handler);
 /* Default callback for widgets */
-cb_ret_t default_widget_callback (Widget * sender, widget_msg_t msg, int parm, void *data);
+cb_ret_t widget_default_callback (Widget * sender, widget_msg_t msg, int parm, void *data);
 void widget_default_set_options_callback (Widget *w, widget_options_t options, gboolean enable);
 void widget_set_options (Widget *w, widget_options_t options, gboolean enable);
 void widget_set_size (Widget * widget, int y, int x, int lines, int cols);
diff --git a/lib/widget/wtools.c b/lib/widget/wtools.c
index 5349b6a53..61c1e0374 100644
--- a/lib/widget/wtools.c
+++ b/lib/widget/wtools.c
@@ -63,7 +63,7 @@ static int sel_pos = 0;
 /** default query callback, used to reposition query */
 
 static cb_ret_t
-default_query_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
+query_default_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data)
 {
     switch (msg)
     {
@@ -107,7 +107,7 @@ default_query_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm,
         /* fallthrough */
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
@@ -126,7 +126,7 @@ do_create_message (int flags, const char *title, const char *text)
     d = last_query_dlg;
 
     /* do resize before initing and running */
-    default_query_callback (d, NULL, DLG_RESIZE, 0, NULL);
+    query_default_callback (d, NULL, DLG_RESIZE, 0, NULL);
 
     init_dlg (d);
     g_free (p);
@@ -304,7 +304,7 @@ query_dialog (const char *header, const char *text, int flags, int count, ...)
 
     /* prepare dialog */
     query_dlg =
-        create_dlg (TRUE, 0, 0, lines, cols, query_colors, default_query_callback, NULL,
+        create_dlg (TRUE, 0, 0, lines, cols, query_colors, query_default_callback, NULL,
                     "[QueryBox]", header, dlg_flags);
 
     if (count > 0)
@@ -334,7 +334,7 @@ query_dialog (const char *header, const char *text, int flags, int count, ...)
         va_end (ap);
 
         /* do resize before running and selecting any widget */
-        default_query_callback (query_dlg, NULL, DLG_RESIZE, 0, NULL);
+        query_default_callback (query_dlg, NULL, DLG_RESIZE, 0, NULL);
 
         if (defbutton != NULL)
             dlg_select_widget (defbutton);
diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c
index 224ce1d80..3a177e2a2 100644
--- a/src/diffviewer/ydiff.c
+++ b/src/diffviewer/ydiff.c
@@ -3345,7 +3345,7 @@ dview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
@@ -3402,7 +3402,7 @@ dview_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, v
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c
index d072b77d2..9d7112341 100644
--- a/src/editor/editcmd.c
+++ b/src/editor/editcmd.c
@@ -135,7 +135,7 @@ edit_save_mode_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm,
         return MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c
index fa796ee42..14d3dd8a8 100644
--- a/src/editor/editcmd_dialogs.c
+++ b/src/editor/editcmd_dialogs.c
@@ -77,7 +77,7 @@ editcmd_dialog_raw_key_query_cb (Dlg_head *h, Widget * sender, dlg_msg_t msg, in
         dlg_stop (h);
         return MSG_HANDLED;
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c
index 523a4abc1..abd24ec1f 100644
--- a/src/editor/editwidget.c
+++ b/src/editor/editwidget.c
@@ -878,7 +878,7 @@ edit_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
         return MSG_HANDLED;
 
     case DLG_DRAW:
-        /* don't use common_dialog_repaint() -- we don't need a frame */
+        /* don't use dlg_default_repaint() -- we don't need a frame */
         tty_setcolor (EDITOR_BACKGROUND);
         dlg_erase (h);
         return MSG_HANDLED;
@@ -956,7 +956,7 @@ edit_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, vo
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
@@ -1027,7 +1027,7 @@ edit_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/achown.c b/src/filemanager/achown.c
index ec750a082..2510b4d6d 100644
--- a/src/filemanager/achown.c
+++ b/src/filemanager/achown.c
@@ -303,7 +303,7 @@ chl_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *data
         }
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
@@ -422,7 +422,7 @@ do_enter_key (Dlg_head * h, int f_pos)
 static void
 chown_refresh (void)
 {
-    common_dialog_repaint (ch_dlg);
+    dlg_default_repaint (ch_dlg);
 
     tty_setcolor (COLOR_NORMAL);
 
@@ -610,7 +610,7 @@ advanced_chown_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm,
         return MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c
index d433f1100..6336e40a8 100644
--- a/src/filemanager/boxes.c
+++ b/src/filemanager/boxes.c
@@ -221,7 +221,7 @@ panel_listing_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm,
         return MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
@@ -291,7 +291,7 @@ tree_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *dat
         return send_message (WIDGET (find_tree (h)), NULL, WIDGET_COMMAND, parm, NULL);
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
@@ -318,7 +318,7 @@ confvfs_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *
         return MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 #endif /* ENABLE_VFS && ENABLE_VFS_FTP */
diff --git a/src/filemanager/chmod.c b/src/filemanager/chmod.c
index 953dad804..02fb9df51 100644
--- a/src/filemanager/chmod.c
+++ b/src/filemanager/chmod.c
@@ -199,7 +199,7 @@ chmod_refresh (Dlg_head * h)
     int y = WIDGET (file_gb)->y + 1;
     int x = WIDGET (file_gb)->x + 2;
 
-    common_dialog_repaint (h);
+    dlg_default_repaint (h);
 
     tty_setcolor (COLOR_NORMAL);
 
@@ -275,7 +275,7 @@ chmod_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *da
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/chown.c b/src/filemanager/chown.c
index acbea34c3..3cc418f9d 100644
--- a/src/filemanager/chown.c
+++ b/src/filemanager/chown.c
@@ -148,7 +148,7 @@ chown_refresh (Dlg_head * h)
     const int y = 3;
     const int x = 7 + GW * 2;
 
-    common_dialog_repaint (h);
+    dlg_default_repaint (h);
 
     tty_setcolor (COLOR_NORMAL);
 
@@ -187,7 +187,7 @@ chown_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *da
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/find.c b/src/filemanager/find.c
index 4835b09f3..d7336633d 100644
--- a/src/filemanager/find.c
+++ b/src/filemanager/find.c
@@ -467,7 +467,7 @@ find_parm_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
@@ -1493,7 +1493,7 @@ find_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *dat
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/hotlist.c b/src/filemanager/hotlist.c
index b4818283b..43ddb4544 100644
--- a/src/filemanager/hotlist.c
+++ b/src/filemanager/hotlist.c
@@ -574,7 +574,7 @@ hotlist_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/info.c b/src/filemanager/info.c
index 5d1a48ba3..7e2a52019 100644
--- a/src/filemanager/info.c
+++ b/src/filemanager/info.c
@@ -316,7 +316,7 @@ info_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/layout.c b/src/filemanager/layout.c
index 958dbafb1..e38ba65d7 100644
--- a/src/filemanager/layout.c
+++ b/src/filemanager/layout.c
@@ -315,7 +315,7 @@ layout_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *d
     case DLG_DRAW:
         /* When repainting the whole dialog (e.g. with C-l) we have to
            update everything */
-        common_dialog_repaint (h);
+        dlg_default_repaint (h);
 
         old_layout.horizontal_split = -1;
         old_layout.left_panel_size = -1;
@@ -422,7 +422,7 @@ layout_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *d
         return MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c
index 057bd57a9..d52f595a7 100644
--- a/src/filemanager/midnight.c
+++ b/src/filemanager/midnight.c
@@ -1595,7 +1595,7 @@ midnight_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/option.c b/src/filemanager/option.c
index 296c0e951..d11e2e4e4 100644
--- a/src/filemanager/option.c
+++ b/src/filemanager/option.c
@@ -82,7 +82,7 @@ configure_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
         return MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c
index 3072577e7..65e256ce3 100644
--- a/src/filemanager/panel.c
+++ b/src/filemanager/panel.c
@@ -3490,7 +3490,7 @@ panel_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *d
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/panelize.c b/src/filemanager/panelize.c
index b141aec7b..42062a31a 100644
--- a/src/filemanager/panelize.c
+++ b/src/filemanager/panelize.c
@@ -121,7 +121,7 @@ panelize_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/filemanager/tree.c b/src/filemanager/tree.c
index e3d17a5af..6608e6e2b 100644
--- a/src/filemanager/tree.c
+++ b/src/filemanager/tree.c
@@ -1260,7 +1260,7 @@ tree_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/src/help.c b/src/help.c
index 9193194e1..38d5e3f9e 100644
--- a/src/help.c
+++ b/src/help.c
@@ -955,7 +955,7 @@ help_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *dat
         return MSG_HANDLED;
 
     case DLG_DRAW:
-        common_dialog_repaint (h);
+        dlg_default_repaint (h);
         help_show (h, currentpoint);
         return MSG_HANDLED;
 
@@ -976,7 +976,7 @@ help_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *dat
         return MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
@@ -1031,7 +1031,7 @@ md_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
diff --git a/src/learn.c b/src/learn.c
index 36b47adc7..05891914b 100644
--- a/src/learn.c
+++ b/src/learn.c
@@ -240,7 +240,7 @@ learn_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm, void *da
         return learn_check_key (parm) ? MSG_HANDLED : MSG_NOT_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }
 
diff --git a/src/viewer/actions_cmd.c b/src/viewer/actions_cmd.c
index b1cb568a5..f04cb0f3a 100644
--- a/src/viewer/actions_cmd.c
+++ b/src/viewer/actions_cmd.c
@@ -626,7 +626,7 @@ mcview_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *
         return MSG_HANDLED;
 
     default:
-        return default_widget_callback (sender, msg, parm, data);
+        return widget_default_callback (sender, msg, parm, data);
     }
 }
 
@@ -668,7 +668,7 @@ mcview_dialog_callback (Dlg_head * h, Widget * sender, dlg_msg_t msg, int parm,
         return MSG_HANDLED;
 
     default:
-        return default_dlg_callback (h, sender, msg, parm, data);
+        return dlg_default_callback (h, sender, msg, parm, data);
     }
 }