diff --git a/awesome.c b/awesome.c
index 198e6642e..9ff6b4e73 100644
--- a/awesome.c
+++ b/awesome.c
@@ -505,7 +505,7 @@ main(int argc, char **argv)
     colors_reqs[1] = xcolor_init_unchecked(&globalconf.colors.bg,
                                            "white", sizeof("white") - 1);
 
-    globalconf.font = draw_font_new("sans 8");
+    globalconf.font = font_new("sans 8");
 
     for(colors_nbr = 0; colors_nbr < 2; colors_nbr++)
         xcolor_init_reply(colors_reqs[colors_nbr]);
diff --git a/font.c b/font.c
index 2ad653547..f5fcb16bf 100644
--- a/font.c
+++ b/font.c
@@ -32,7 +32,7 @@
  * \return A new font.
  */
 font_t *
-draw_font_new(const char *fontname)
+font_new(const char *fontname)
 {
     cairo_surface_t *surface;
     cairo_t *cr;
@@ -66,7 +66,7 @@ draw_font_new(const char *fontname)
  * \param font Font to delete.
  */
 void
-draw_font_delete(font_t **font)
+font_delete(font_t **font)
 {
     if(*font)
     {
diff --git a/font.h b/font.h
index 56f112dba..31e1559cc 100644
--- a/font.h
+++ b/font.h
@@ -30,8 +30,8 @@ typedef struct
     int height;
 } font_t;
 
-font_t *draw_font_new(const char *);
-void draw_font_delete(font_t **);
+font_t *font_new(const char *);
+void font_delete(font_t **);
 
 #endif
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/luaa.c b/luaa.c
index 27d2c6da2..d0d451863 100644
--- a/luaa.c
+++ b/luaa.c
@@ -597,8 +597,8 @@ luaA_awesome_newindex(lua_State *L)
       case A_TK_FONT:
         {
             const char *newfont = luaL_checkstring(L, 3);
-            draw_font_delete(&globalconf.font);
-            globalconf.font = draw_font_new(newfont);
+            font_delete(&globalconf.font);
+            globalconf.font = font_new(newfont);
             /* refresh all wiboxes */
             foreach(wibox, globalconf.wiboxes)
                 (*wibox)->need_update = true;