diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 95b2cb3386..b4630d3e7d 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -168,8 +168,8 @@ int kbd_input(char* text, int buflen)
         lcd_drawline(curpos, main_y, curpos, main_y + font_h);
 
         /* draw the status bar */
-        set_buttonbar("Shift", "OK", "Del");
-        draw_buttonbar();
+        buttonbar_set("Shift", "OK", "Del");
+        buttonbar_draw();
         
         /* highlight the key that has focus */
         lcd_invertrect(font_w * x, font_h * y, font_w, font_h);
diff --git a/apps/status.c b/apps/status.c
index a1e01106bc..01929e4540 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -255,7 +255,7 @@ static char stored_caption1[8];
 static char stored_caption2[8];
 static char stored_caption3[8];
 
-void set_buttonbar(char* caption1, char *caption2, char *caption3)
+void buttonbar_set(char* caption1, char *caption2, char *caption3)
 {
     strncpy(stored_caption1, caption1, 7);
     stored_caption1[7] = 0;
@@ -265,7 +265,7 @@ void set_buttonbar(char* caption1, char *caption2, char *caption3)
     stored_caption3[7] = 0;
 }
 
-void draw_buttonbar(void)
+void buttonbar_draw(void)
 {
     draw_buttonbar_btn(0, stored_caption1);
     draw_buttonbar_btn(1, stored_caption2);
diff --git a/apps/status.h b/apps/status.h
index 1331351523..72a490f499 100644
--- a/apps/status.h
+++ b/apps/status.h
@@ -34,8 +34,8 @@ void status_init(void);
 void status_set_playmode(enum playmode mode);
 #ifdef HAVE_LCD_BITMAP
 bool statusbar(bool state);
-void set_buttonbar(char* caption1, char* caption2, char* caption3);
-void draw_buttonbar(void);
+void buttonbar_set(char* caption1, char* caption2, char* caption3);
+void buttonbar_draw(void);
 #endif
 void status_draw(bool force_redraw);