diff --git a/server/drivers/curses_drv.c b/server/drivers/curses_drv.c
index 7e7c451..e7a19c0 100644
--- a/server/drivers/curses_drv.c
+++ b/server/drivers/curses_drv.c
@@ -133,10 +133,10 @@ typedef struct driver_private_data {
 MODULE_EXPORT char *api_version = API_VERSION;
 MODULE_EXPORT int stay_in_foreground = 1;
 MODULE_EXPORT int supports_multiple = 0;
-MODULE_EXPORT char *symbol_prefix = "curses_drv_";
+MODULE_EXPORT char *symbol_prefix = "curses_";
 
 
-void curses_drv_restore_screen (Driver *drvthis);
+void curses_restore_screen (Driver *drvthis);
 
 //////////////////////////////////////////////////////////////////////////
 ////////////////////// For Curses Terminal Output ////////////////////////
@@ -185,7 +185,7 @@ set_background_color (char * buf) {
 }
 
 MODULE_EXPORT int
-curses_drv_init (Driver *drvthis)
+curses_init (Driver *drvthis)
 {
 	PrivateData *p;
 	char buf[256];
@@ -311,7 +311,7 @@ curses_drv_init (Driver *drvthis)
 		init_pair(5, COLOR_WHITE, backlight_color);
 	}
 
-	curses_drv_clear(drvthis);
+	curses_clear(drvthis);
 
 	report(RPT_DEBUG, "%s: init() done", drvthis->name);
 
@@ -319,7 +319,7 @@ curses_drv_init (Driver *drvthis)
 }
 
 static void
-curses_drv_wborder (Driver *drvthis)
+curses_wborder (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -343,7 +343,7 @@ curses_drv_wborder (Driver *drvthis)
 }
 
 MODULE_EXPORT void
-curses_drv_close (Driver *drvthis)
+curses_close (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 	
@@ -369,7 +369,7 @@ curses_drv_close (Driver *drvthis)
 // Returns the display width
 //
 MODULE_EXPORT int
-curses_drv_width (Driver *drvthis)
+curses_width (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -380,7 +380,7 @@ curses_drv_width (Driver *drvthis)
 // Returns the display height
 //
 MODULE_EXPORT int
-curses_drv_height (Driver *drvthis)
+curses_height (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -391,17 +391,17 @@ curses_drv_height (Driver *drvthis)
 // Clears the LCD screen
 //
 MODULE_EXPORT void
-curses_drv_clear (Driver *drvthis)
+curses_clear (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
 	wbkgdset(p->win, COLOR_PAIR(p->current_color_pair) | ' ');
-	curses_drv_wborder(drvthis);
+	curses_wborder(drvthis);
 	werase(p->win);
 }
 
 MODULE_EXPORT void
-curses_drv_backlight (Driver *drvthis, int on)
+curses_backlight (Driver *drvthis, int on)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -422,7 +422,7 @@ curses_drv_backlight (Driver *drvthis, int on)
 		p->current_border_pair = 3;
 	}
 
-	curses_drv_clear(drvthis);
+	curses_clear(drvthis);
 }
 
 /////////////////////////////////////////////////////////////////
@@ -430,7 +430,7 @@ curses_drv_backlight (Driver *drvthis, int on)
 // upper-left is (1,1), and the lower right should be (20,4).
 //
 MODULE_EXPORT void
-curses_drv_string (Driver *drvthis, int x, int y, char *string)
+curses_string (Driver *drvthis, int x, int y, char *string)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -445,7 +445,7 @@ curses_drv_string (Driver *drvthis, int x, int y, char *string)
 // upper-left is (1,1), and the lower right should be (20,4).
 //
 MODULE_EXPORT void
-curses_drv_chr (Driver *drvthis, int x, int y, char c)
+curses_chr (Driver *drvthis, int x, int y, char c)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -459,7 +459,7 @@ curses_drv_chr (Driver *drvthis, int x, int y, char c)
 // Draws a vertical bar; erases entire column onscreen.
 //
 MODULE_EXPORT void
-curses_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int options)
+curses_vbar (Driver *drvthis, int x, int y, int len, int promille, int options)
 {
 	PrivateData *p = drvthis->private_data;
 	// map 
@@ -487,11 +487,11 @@ curses_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int optio
 
 		if (pixels >= p->cellheight) {
 			/* write a "full" block to the screen... */
-			curses_drv_chr(drvthis, x, y-pos, (p->useACS) ? ACS_BLOCK : '#');
+			curses_chr(drvthis, x, y-pos, (p->useACS) ? ACS_BLOCK : '#');
 		}
 		else if (pixels > 0) {
 			// write a partial block...
-			curses_drv_chr(drvthis, x, y-pos, map[len-1]);
+			curses_chr(drvthis, x, y-pos, map[len-1]);
 			break;
 		}
 		else {
@@ -506,7 +506,7 @@ curses_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int optio
 // Draws a horizontal bar to the right.
 //
 MODULE_EXPORT void
-curses_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int options)
+curses_hbar (Driver *drvthis, int x, int y, int len, int promille, int options)
 {
 	PrivateData *p = drvthis->private_data;
 	int pixels = ((long) 2 * len * p->cellwidth) * promille / 2000;
@@ -529,11 +529,11 @@ curses_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int optio
 
 		if (pixels >= p->cellwidth * 2/3) {
 			/* write a "full" block to the screen... */
-			curses_drv_chr(drvthis, x+pos, y, '=');
+			curses_chr(drvthis, x+pos, y, '=');
 		}
 		else if (pixels > p->cellwidth * 1/3) {
 			/* write a partial block... */
-			curses_drv_chr(drvthis, x+pos, y, '-');
+			curses_chr(drvthis, x+pos, y, '-');
 			break;
 		}
 		else {
@@ -548,7 +548,7 @@ curses_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int optio
 // Sets character 0 to an icon...
 //
 MODULE_EXPORT int
-curses_drv_icon (Driver *drvthis, int x, int y, int icon)
+curses_icon (Driver *drvthis, int x, int y, int icon)
 {
 	PrivateData *p = drvthis->private_data;
 	char ch = '?';
@@ -581,7 +581,7 @@ curses_drv_icon (Driver *drvthis, int x, int y, int icon)
 		default:
 			return -1; /* Let the core do it */
 	}
-	curses_drv_chr(drvthis, x, y, ch);
+	curses_chr(drvthis, x, y, ch);
 
 	return 0;
 }
@@ -590,24 +590,24 @@ curses_drv_icon (Driver *drvthis, int x, int y, int icon)
 // Flushes all output to the lcd...
 //
 MODULE_EXPORT void
-curses_drv_flush (Driver *drvthis)
+curses_flush (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 	int c;
 
 	if ((c = getch()) != ERR)
 		if (c == 0x0C) {	/* ^L restores screen */
-			curses_drv_restore_screen(drvthis);
+			curses_restore_screen(drvthis);
 			ungetch(c);
 		}
 
-	curses_drv_wborder(drvthis);
+	curses_wborder(drvthis);
 	wrefresh(p->win);
 }
 
 
 MODULE_EXPORT const char *
-curses_drv_get_key (Driver *drvthis)
+curses_get_key (Driver *drvthis)
 {
 	//PrivateData *p = drvthis->private_data;
 	static char ret_val[2] = {0,0};
@@ -618,7 +618,7 @@ curses_drv_get_key (Driver *drvthis)
 			return NULL;
 		case 0x0C:
 			/* internal: ^L restores screen */
-			curses_drv_restore_screen(drvthis);
+			curses_restore_screen(drvthis);
 			return NULL;
 			break;
 		case KEY_LEFT:
@@ -643,7 +643,7 @@ curses_drv_get_key (Driver *drvthis)
 }
 
 void
-curses_drv_restore_screen (Driver *drvthis)
+curses_restore_screen (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
diff --git a/server/drivers/curses_drv.h b/server/drivers/curses_drv.h
index eb00339..a922508 100644
--- a/server/drivers/curses_drv.h
+++ b/server/drivers/curses_drv.h
@@ -3,26 +3,24 @@
 
 #include "lcd.h"
 
-MODULE_EXPORT int  curses_drv_init (Driver * drvthis);
-MODULE_EXPORT void curses_drv_close (Driver *drvthis);
-MODULE_EXPORT int  curses_drv_width (Driver *drvthis);
-MODULE_EXPORT int  curses_drv_height (Driver *drvthis);
-MODULE_EXPORT void curses_drv_clear (Driver *drvthis);
-MODULE_EXPORT void curses_drv_flush (Driver *drvthis);
-MODULE_EXPORT void curses_drv_string (Driver *drvthis, int x, int y, char string[]);
-MODULE_EXPORT void curses_drv_chr (Driver *drvthis, int x, int y, char c);
+MODULE_EXPORT int  curses_init (Driver * drvthis);
+MODULE_EXPORT void curses_close (Driver *drvthis);
+MODULE_EXPORT int  curses_width (Driver *drvthis);
+MODULE_EXPORT int  curses_height (Driver *drvthis);
+MODULE_EXPORT void curses_clear (Driver *drvthis);
+MODULE_EXPORT void curses_flush (Driver *drvthis);
+MODULE_EXPORT void curses_string (Driver *drvthis, int x, int y, char string[]);
+MODULE_EXPORT void curses_chr (Driver *drvthis, int x, int y, char c);
 
-MODULE_EXPORT void curses_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int options);
-MODULE_EXPORT void curses_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int options);
-MODULE_EXPORT void curses_drv_num (Driver *drvthis, int x, int num);
-MODULE_EXPORT void curses_drv_heartbeat (Driver *drvthis, int type);
-MODULE_EXPORT int  curses_drv_icon (Driver *drvthis, int x, int y, int icon);
+MODULE_EXPORT void curses_vbar (Driver *drvthis, int x, int y, int len, int promille, int options);
+MODULE_EXPORT void curses_hbar (Driver *drvthis, int x, int y, int len, int promille, int options);
+MODULE_EXPORT void curses_num (Driver *drvthis, int x, int num);
+MODULE_EXPORT void curses_heartbeat (Driver *drvthis, int type);
+MODULE_EXPORT int  curses_icon (Driver *drvthis, int x, int y, int icon);
 
-MODULE_EXPORT void curses_drv_backlight (Driver *drvthis, int on);
+MODULE_EXPORT void curses_backlight (Driver *drvthis, int on);
 
-MODULE_EXPORT const char *curses_drv_get_key (Driver *drvthis);
-
-MODULE_EXPORT void curses_drv_init_num (Driver *drvthis);
+MODULE_EXPORT const char *curses_get_key (Driver *drvthis);
 
 /*Default settings for config file parsing*/
 #define CONF_DEF_FOREGR "blue"
diff --git a/server/drivers/svgalib_drv.c b/server/drivers/svgalib_drv.c
index f4a7d03..e633752 100644
--- a/server/drivers/svgalib_drv.c
+++ b/server/drivers/svgalib_drv.c
@@ -214,14 +214,14 @@ static char icon_char = '@';
 MODULE_EXPORT char *api_version = API_VERSION;
 MODULE_EXPORT int stay_in_foreground = 1;
 MODULE_EXPORT int supports_multiple = 0;
-MODULE_EXPORT char *symbol_prefix = "svgalib_drv_";
+MODULE_EXPORT char *symbol_prefix = "svga_";
 
 
 /**
  * Init driver
  */
 MODULE_EXPORT int
-svgalib_drv_init (Driver *drvthis)
+svga_init (Driver *drvthis)
 {
 	char modestr[LCD_MAX_WIDTH+1] = DEFAULT_MODESTR;
 	char size[LCD_MAX_WIDTH+1] = DEFAULT_SIZE;
@@ -370,7 +370,7 @@ svgalib_drv_init (Driver *drvthis)
  * Close down driver
  */
 MODULE_EXPORT void
-svgalib_drv_close (Driver *drvthis)
+svga_close (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -393,7 +393,7 @@ svgalib_drv_close (Driver *drvthis)
  * Return width
  */
 MODULE_EXPORT int
-svgalib_drv_width (Driver *drvthis)
+svga_width (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -405,7 +405,7 @@ svgalib_drv_width (Driver *drvthis)
  * Return height
  */
 MODULE_EXPORT int
-svgalib_drv_height (Driver *drvthis)
+svga_height (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -417,7 +417,7 @@ svgalib_drv_height (Driver *drvthis)
  * Return cellwidth
  */
 MODULE_EXPORT int
-svgalib_drv_cellwidth (Driver *drvthis)
+svga_cellwidth (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -429,7 +429,7 @@ svgalib_drv_cellwidth (Driver *drvthis)
  * Return cellheight
  */
 MODULE_EXPORT int
-svgalib_drv_cellheight (Driver *drvthis)
+svga_cellheight (Driver *drvthis)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -441,7 +441,7 @@ svgalib_drv_cellheight (Driver *drvthis)
  * Clear screen
  */
 MODULE_EXPORT void
-svgalib_drv_clear (Driver * drvthis)
+svga_clear (Driver * drvthis)
 {
 	debug(RPT_DEBUG, "%s(%p)", __FUNCTION__, drvthis);
 
@@ -454,7 +454,7 @@ svgalib_drv_clear (Driver * drvthis)
  * Flush framebuffer to screen
  */
 MODULE_EXPORT void
-svgalib_drv_flush (Driver *drvthis)
+svga_flush (Driver *drvthis)
 {
 	/* It's already on the screen ! */
 }
@@ -465,7 +465,7 @@ svgalib_drv_flush (Driver *drvthis)
  * upper-left is (1,1), and the lower right should be (p->width,p->height).
  */
 MODULE_EXPORT void
-svgalib_drv_string (Driver *drvthis, int x, int y, char string[])
+svga_string (Driver *drvthis, int x, int y, char string[])
 {
 	PrivateData *p = drvthis->private_data;
 	int i;
@@ -493,7 +493,7 @@ svgalib_drv_string (Driver *drvthis, int x, int y, char string[])
  * upper-left is (1,1), and the lower right should be (p->width,p->height).
  */
 MODULE_EXPORT void
-svgalib_drv_chr (Driver *drvthis, int x, int y, char c)
+svga_chr (Driver *drvthis, int x, int y, char c)
 {
 	PrivateData *p = drvthis->private_data;
 	char buffer[2];
@@ -518,7 +518,7 @@ svgalib_drv_chr (Driver *drvthis, int x, int y, char c)
  * Writes a big number, but not.  A bit like the curses driver.
  */
 MODULE_EXPORT void
-svgalib_drv_num (Driver *drvthis, int x, int num)
+svga_num (Driver *drvthis, int x, int num)
 {
 	int y, dx;
 	char c;
@@ -532,7 +532,7 @@ svgalib_drv_num (Driver *drvthis, int x, int num)
 
 	for (y = 1; y < 5; y++)
 		for (dx = 0; dx < 3; dx++)
-			svgalib_drv_chr(drvthis, x + dx, y, c);
+			svga_chr(drvthis, x + dx, y, c);
 }
 
 
@@ -540,7 +540,7 @@ svgalib_drv_num (Driver *drvthis, int x, int num)
  * Draws a vertical bar; erases entire column onscreen.
  */
 MODULE_EXPORT void
-svgalib_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int pattern)
+svga_vbar (Driver *drvthis, int x, int y, int len, int promille, int pattern)
 {
 	int pos;
 
@@ -548,7 +548,7 @@ svgalib_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int patt
 
 	for (pos = 0; pos < len; pos++) {
 		if (2 * pos < ((long) promille * len / 500 + 1)) {
-			svgalib_drv_chr(drvthis, x, y-pos, '|');
+			svga_chr(drvthis, x, y-pos, '|');
 		} else {
 			; /* print nothing */
 		}
@@ -560,7 +560,7 @@ svgalib_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int patt
  * Draws a horizontal bar to the right.
  */
 MODULE_EXPORT void
-svgalib_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int pattern)
+svga_hbar (Driver *drvthis, int x, int y, int len, int promille, int pattern)
 {
 	int pos;
 
@@ -568,7 +568,7 @@ svgalib_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int patt
 
 	for (pos = 0; pos < len; pos++) {
 		if (2 * pos < ((long) promille * len / 500 + 1)) {
-			svgalib_drv_chr(drvthis, x+pos, y, '-');
+			svga_chr(drvthis, x+pos, y, '-');
 		} else {
 			; /* print nothing */
 		}
@@ -580,7 +580,7 @@ svgalib_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int patt
  * Return a keypress
  */
 MODULE_EXPORT const char *
-svgalib_drv_get_key (Driver *drvthis)
+svga_get_key (Driver *drvthis)
 {
 	static char buf[2] = " ";
 	int key = vga_getkey ();
@@ -630,7 +630,7 @@ svgalib_drv_get_key (Driver *drvthis)
  * This is only the locally stored contrast.
  */
 MODULE_EXPORT int
-svgalib_drv_get_contrast (Driver *drvthis)
+svga_get_contrast (Driver *drvthis)
 {
         PrivateData *p = drvthis->private_data;
 
@@ -642,7 +642,7 @@ svgalib_drv_get_contrast (Driver *drvthis)
  *  Changes screen contrast (in promille)
  */
 MODULE_EXPORT void
-svgalib_drv_set_contrast (Driver *drvthis, int promille)
+svga_set_contrast (Driver *drvthis, int promille)
 {
 	PrivateData *p = drvthis->private_data;
 	int contrast;
@@ -665,7 +665,7 @@ svgalib_drv_set_contrast (Driver *drvthis, int promille)
  * Retrieves brightness (in promille)
  */
 MODULE_EXPORT int
-svgalib_drv_get_brightness(Driver *drvthis, int state)
+svga_get_brightness(Driver *drvthis, int state)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -677,7 +677,7 @@ svgalib_drv_get_brightness(Driver *drvthis, int state)
  * Sets on/off brightness (in promille)
  */
 MODULE_EXPORT void
-svgalib_drv_set_brightness(Driver *drvthis, int state, int promille)
+svga_set_brightness(Driver *drvthis, int state, int promille)
 {
 	PrivateData *p = drvthis->private_data;
 
@@ -700,7 +700,7 @@ svgalib_drv_set_brightness(Driver *drvthis, int state, int promille)
  * The hardware support any value between 0 and 100.
  */
 MODULE_EXPORT void
-svgalib_drv_backlight (Driver *drvthis, int on)
+svga_backlight (Driver *drvthis, int on)
 {
 	PrivateData *p = drvthis->private_data;
 	int value = (on == BACKLIGHT_ON) ? p->brightness : p->offbrightness;
diff --git a/server/drivers/svgalib_drv.h b/server/drivers/svgalib_drv.h
index ec10d3f..7ba06da 100644
--- a/server/drivers/svgalib_drv.h
+++ b/server/drivers/svgalib_drv.h
@@ -26,27 +26,27 @@ typedef struct driver_private_data {
 } PrivateData;
 
 
-MODULE_EXPORT int  svgalib_drv_init (Driver *drvthis);
-MODULE_EXPORT void svgalib_drv_close (Driver *drvthis);
-MODULE_EXPORT int  svgalib_drv_width (Driver *drvthis);
-MODULE_EXPORT int  svgalib_drv_height (Driver *drvthis);
-MODULE_EXPORT int  svgalib_drv_cellwidth (Driver *drvthis);
-MODULE_EXPORT int  svgalib_drv_cellheight (Driver *drvthis);
-MODULE_EXPORT void svgalib_drv_clear (Driver *drvthis);
-MODULE_EXPORT void svgalib_drv_flush (Driver *drvthis);
-MODULE_EXPORT void svgalib_drv_string (Driver *drvthis, int x, int y, char string[]);
-MODULE_EXPORT void svgalib_drv_chr (Driver *drvthis, int x, int y, char c);
+MODULE_EXPORT int  svga_init (Driver *drvthis);
+MODULE_EXPORT void svga_close (Driver *drvthis);
+MODULE_EXPORT int  svga_width (Driver *drvthis);
+MODULE_EXPORT int  svga_height (Driver *drvthis);
+MODULE_EXPORT int  svga_cellwidth (Driver *drvthis);
+MODULE_EXPORT int  svga_cellheight (Driver *drvthis);
+MODULE_EXPORT void svga_clear (Driver *drvthis);
+MODULE_EXPORT void svga_flush (Driver *drvthis);
+MODULE_EXPORT void svga_string (Driver *drvthis, int x, int y, char string[]);
+MODULE_EXPORT void svga_chr (Driver *drvthis, int x, int y, char c);
 
-MODULE_EXPORT void svgalib_drv_vbar (Driver *drvthis, int x, int y, int len, int promille, int pattern);
-MODULE_EXPORT void svgalib_drv_hbar (Driver *drvthis, int x, int y, int len, int promille, int pattern);
-MODULE_EXPORT void svgalib_drv_num (Driver *drvthis, int x, int num);
+MODULE_EXPORT void svga_vbar (Driver *drvthis, int x, int y, int len, int promille, int pattern);
+MODULE_EXPORT void svga_hbar (Driver *drvthis, int x, int y, int len, int promille, int pattern);
+MODULE_EXPORT void svga_num (Driver *drvthis, int x, int num);
 
-MODULE_EXPORT const char * svgalib_drv_get_key (Driver *drvthis);
+MODULE_EXPORT const char * svga_get_key (Driver *drvthis);
 
-MODULE_EXPORT int  svgalib_drv_get_contrast (Driver *drvthis);
-MODULE_EXPORT void svgalib_drv_set_contrast (Driver *drvthis, int promille);
-MODULE_EXPORT int  svgalib_drv_get_brightness(Driver *drvthis, int state);
-MODULE_EXPORT void svgalib_drv_set_brightness(Driver *drvthis, int state, int promille);
-MODULE_EXPORT void svgalib_drv_backlight (Driver *drvthis, int on);
+MODULE_EXPORT int  svga_get_contrast (Driver *drvthis);
+MODULE_EXPORT void svga_set_contrast (Driver *drvthis, int promille);
+MODULE_EXPORT int  svga_get_brightness(Driver *drvthis, int state);
+MODULE_EXPORT void svga_set_brightness(Driver *drvthis, int state, int promille);
+MODULE_EXPORT void svga_backlight (Driver *drvthis, int on);
 
 #endif