diff --git a/payloads/libpayload/Config.in b/payloads/libpayload/Config.in
index fd585b9b46..572e14f6b4 100644
--- a/payloads/libpayload/Config.in
+++ b/payloads/libpayload/Config.in
@@ -91,8 +91,8 @@ config VGA_VIDEO_CONSOLE
 	depends on VIDEO_CONSOLE
 	default y
 
-config GEODE_VIDEO_CONSOLE
-	bool "Geode video console driver"
+config GEODELX_VIDEO_CONSOLE
+	bool "Geode LX video console driver"
 	depends on VIDEO_CONSOLE
 	default n
 
diff --git a/payloads/libpayload/configs/defconfig b/payloads/libpayload/configs/defconfig
index 13828d48e0..c011a4fcfa 100644
--- a/payloads/libpayload/configs/defconfig
+++ b/payloads/libpayload/configs/defconfig
@@ -20,7 +20,7 @@ CONFIG_SERIAL_IOBASE=0x3f8
 # CONFIG_SERIAL_ACS_FALLBACK is not set
 CONFIG_VIDEO_CONSOLE=y
 CONFIG_VGA_VIDEO_CONSOLE=y
-# CONFIG_GEODE_VIDEO_CONSOLE is not set
+# CONFIG_GEODELX_VIDEO_CONSOLE is not set
 CONFIG_PC_KEYBOARD=y
 CONFIG_PC_KEYBOARD_LAYOUT_US=y
 # CONFIG_PC_KEYBOARD_LAYOUT_DE is not set
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.inc
index cad2080216..a9ece921ed 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.inc
@@ -44,9 +44,9 @@ TARGETS-$(CONFIG_NVRAM) += drivers/options.o
 TARGETS-$(CONFIG_VIDEO_CONSOLE) += drivers/video/video.o
 TARGETS-$(CONFIG_VGA_VIDEO_CONSOLE) += drivers/video/vga.o
 
-# Geode console drivers
-TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/geode.o
-TARGETS-$(CONFIG_GEODE_VIDEO_CONSOLE) += drivers/video/font8x16.o
+# Geode LX console drivers
+TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/geodelx.o
+TARGETS-$(CONFIG_GEODELX_VIDEO_CONSOLE) += drivers/video/font8x16.o
 
 # USB stack
 TARGETS-$(CONFIG_USB) += drivers/usb/usbinit.o
diff --git a/payloads/libpayload/drivers/video/geode.c b/payloads/libpayload/drivers/video/geodelx.c
similarity index 94%
rename from payloads/libpayload/drivers/video/geode.c
rename to payloads/libpayload/drivers/video/geodelx.c
index c3823ffe18..cb1c4be40b 100644
--- a/payloads/libpayload/drivers/video/geode.c
+++ b/payloads/libpayload/drivers/video/geodelx.c
@@ -197,13 +197,13 @@ static void init_video_mode(void)
 	writel(0x2B601, DC + 0x04);
 }
 
-static void geode_set_palette(int entry, unsigned int color)
+static void geodelx_set_palette(int entry, unsigned int color)
 {
 	writel(entry, DC + 0x70);
 	writel(color, DC + 0x74);
 }
 
-static void geode_scroll_up(void)
+static void geodelx_scroll_up(void)
 {
 	unsigned char *dst = FB;
 	unsigned char *src = FB + vga_mode.hactive;
@@ -224,7 +224,7 @@ static void geode_scroll_up(void)
 	}
 }
 
-static void geode_clear(void)
+static void geodelx_clear(void)
 {
 	int row;
 	unsigned char *ptr = FB;
@@ -235,7 +235,7 @@ static void geode_clear(void)
 	}
 }
 
-static void geode_putc(u8 row, u8 col, unsigned int ch)
+static void geodelx_putc(u8 row, u8 col, unsigned int ch)
 {
 	unsigned char *dst;
 	unsigned char *glyph = font8x16 + ((ch & 0xFF) * FONT_HEIGHT);
@@ -259,7 +259,7 @@ static void geode_putc(u8 row, u8 col, unsigned int ch)
 	}
 }
 
-static int geode_init(void)
+static int geodelx_init(void)
 {
 	pcidev_t dev;
 	int i;
@@ -277,15 +277,15 @@ static int geode_init(void)
 	/* Set up the palette */
 
 	for(i = 0; i < ARRAY_SIZE(vga_colors); i++) {
-		geode_set_palette(i, vga_colors[i]);
+		geodelx_set_palette(i, vga_colors[i]);
 	}
 
 	return 0;
 }
 
-struct video_console geode_video_console = {
-	.init = geode_init,
-	.putc = geode_putc,
-	.clear = geode_clear,
-	.scroll_up = geode_scroll_up
+struct video_console geodelx_video_console = {
+	.init = geodelx_init,
+	.putc = geodelx_putc,
+	.clear = geodelx_clear,
+	.scroll_up = geodelx_scroll_up
 };
diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c
index 23d0c1bb58..6ebc0f8ab6 100644
--- a/payloads/libpayload/drivers/video/video.c
+++ b/payloads/libpayload/drivers/video/video.c
@@ -31,8 +31,8 @@
 #include <libpayload.h>
 #include <video_console.h>
 
-#ifdef CONFIG_GEODE_VIDEO_CONSOLE
-extern struct video_console geode_video_console;
+#ifdef CONFIG_GEODELX_VIDEO_CONSOLE
+extern struct video_console geodelx_video_console;
 #endif
 
 #ifdef CONFIG_VGA_VIDEO_CONSOLE
@@ -41,8 +41,8 @@ extern struct video_console vga_video_console;
 
 static struct video_console *console_list[] =
 {
-#ifdef CONFIG_GEODE_VIDEO_CONSOLE
-	&geode_video_console,
+#ifdef CONFIG_GEODELX_VIDEO_CONSOLE
+	&geodelx_video_console,
 #endif
 #ifdef CONFIG_VGA_VIDEO_CONSOLE
 	&vga_video_console,