diff --git a/Makefile b/Makefile
index 067590ae55d6312d5cce53066ad68da8217fff4e..4b2fbbd1615a12b6091f456b03be3ba58d96f204 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ endif
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
 	82802ab.o msys_doc.o pm49fl004.o sst49lf040.o sst49lfxxxc.o \
-	sst_fwhub.o layout.o lbtable.o flashchips.o flashrom.o \
+	sst_fwhub.o layout.o cbtable.o flashchips.o flashrom.o \
 	sharplhf00l04.o w29ee011.o spi.o
 
 all: pciutils dep $(PROGRAM)
diff --git a/lbtable.c b/cbtable.c
similarity index 99%
rename from lbtable.c
rename to cbtable.c
index 1cca964c22e15b8c62bfb2f13508b93e47c5542e..cc3a73c329deb8ebb903f8944ae180aee5f00035 100644
--- a/lbtable.c
+++ b/cbtable.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include "flash.h"
-#include "linuxbios_tables.h"
+#include "coreboot_tables.h"
 
 char *lb_part = NULL, *lb_vendor = NULL;
 
diff --git a/linuxbios_tables.h b/coreboot_tables.h
similarity index 100%
rename from linuxbios_tables.h
rename to coreboot_tables.h