rename screen uicb correctly

awesomerc

@@ -242,13 +242,13 @@ keys
     {
         modkey = {"Mod4", "Control"}
         key = "j"
-        command = "focusnextscreen"
+        command = "screen_focusnext"
     }
     key
     {
         modkey = {"Mod4", "Control"}
         key = "k"
-        command = "focusprevscreen"
+        command = "screen_focusprev"
     }
     key
     {

config.c

@@ -92,9 +92,9 @@ const NameFuncLink UicbList[] = {
     {"tag_setnmaster", uicb_tag_setnmaster},
     {"tag_setncol", uicb_tag_setncol},
     /* screen.c */
-    {"focusnextscreen", uicb_focusnextscreen},
-    {"focusprevscreen", uicb_focusprevscreen},
-    {"movetoscreen", uicb_movetoscreen},
+    {"screen_focusnext", uicb_screen_focusnext},
+    {"screen_focusprev", uicb_screen_focusprev},
+    {"client_movetoscreen", uicb_client_movetoscreen},
     /* awesome.c */
     {"quit", uicb_quit},
     /* statusbar.c */

screen.c

@@ -216,7 +216,7 @@ move_mouse_pointer_to_screen(Display *disp, int screen)
 }
 
 void
-uicb_focusnextscreen(awesome_config * awesomeconf,
+uicb_screen_focusnext(awesome_config * awesomeconf,
                       const char *arg __attribute__ ((unused)))
 {
     Client *c;
@@ -232,7 +232,7 @@ uicb_focusnextscreen(awesome_config * awesomeconf,
 }
 
 void
-uicb_focusprevscreen(awesome_config * awesomeconf,
+uicb_screen_focusprev(awesome_config * awesomeconf,
                       const char *arg __attribute__ ((unused)))
 {
     Client *c;
@@ -253,7 +253,7 @@ uicb_focusprevscreen(awesome_config * awesomeconf,
  * \ingroup ui_callback
  */
 void
-uicb_movetoscreen(awesome_config * awesomeconf,
+uicb_client_movetoscreen(awesome_config * awesomeconf,
                          const char *arg)
 {
     int new_screen, prev_screen;

screen.h

@@ -34,9 +34,10 @@ int get_screen_bycoord(Display *, int, int);
 int get_screen_count(Display *);
 int get_phys_screen(Display *, int);
 void move_client_to_screen(Client *, awesome_config *, Bool);
-UICB_PROTO(uicb_focusnextscreen);
-UICB_PROTO(uicb_focusprevscreen);
-UICB_PROTO(uicb_movetoscreen);
+
+UICB_PROTO(uicb_screen_focusnext);
+UICB_PROTO(uicb_screen_focusprev);
+UICB_PROTO(uicb_client_movetoscreen);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99