diff --git a/console.c b/console.c
index f7b5d49..9bbef59 100644
--- a/console.c
+++ b/console.c
@@ -110,12 +110,12 @@
     GRAPHIC_CONSOLE,
     TEXT_CONSOLE,
     TEXT_CONSOLE_FIXED_SIZE
-} e_console_type;
+} console_type_t;
 
 /* ??? This is mis-named.
    It is used for both text and graphical consoles.  */
 struct TextConsole {
-    e_console_type console_type;
+    console_type_t console_type;
     DisplayState *ds;
     /* Graphic console state.  */
     vga_hw_update_ptr hw_update;
@@ -183,7 +183,7 @@
     active_console = previous_active_console;
 }
 
-void vga_hw_text_update(a_console_ch *chardata)
+void vga_hw_text_update(console_ch_t *chardata)
 {
     if (active_console && active_console->hw_text_update)
         active_console->hw_text_update(active_console->hw, chardata);
@@ -1197,7 +1197,7 @@
     console_refresh(s);
 }
 
-static void text_console_update(void *opaque, a_console_ch *chardata)
+static void text_console_update(void *opaque, console_ch_t *chardata)
 {
     TextConsole *s = (TextConsole *) opaque;
     int i, j, src;
@@ -1236,7 +1236,7 @@
     return NULL;
 }
 
-static TextConsole *new_console(DisplayState *ds, e_console_type console_type)
+static TextConsole *new_console(DisplayState *ds, console_type_t console_type)
 {
     TextConsole *s;
     int i;