diff --git a/src/arch/i386/boot/Config.lb b/src/arch/i386/boot/Config.lb
index c5a14d0f78..4f8a8680ec 100644
--- a/src/arch/i386/boot/Config.lb
+++ b/src/arch/i386/boot/Config.lb
@@ -2,7 +2,7 @@ uses HAVE_PIRQ_TABLE
 uses HAVE_ACPI_TABLES
 
 object boot.o
-object linuxbios_table.o
+object coreboot_table.o
 object tables.o
 if HAVE_PIRQ_TABLE
 object pirq_routing.o 
diff --git a/src/arch/i386/boot/linuxbios_table.c b/src/arch/i386/boot/coreboot_table.c
similarity index 99%
rename from src/arch/i386/boot/linuxbios_table.c
rename to src/arch/i386/boot/coreboot_table.c
index 0dbdce36d6..b13b63ee65 100644
--- a/src/arch/i386/boot/linuxbios_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -1,7 +1,7 @@
 #include <console/console.h>
 #include <ip_checksum.h>
-#include <boot/linuxbios_tables.h>
-#include "linuxbios_table.h"
+#include <boot/coreboot_tables.h>
+#include "coreboot_table.h"
 #include <string.h>
 #include <version.h>
 #include <device/device.h>
diff --git a/src/arch/i386/boot/linuxbios_table.h b/src/arch/i386/boot/coreboot_table.h
similarity index 96%
rename from src/arch/i386/boot/linuxbios_table.h
rename to src/arch/i386/boot/coreboot_table.h
index 7944791de2..a5ba0f5963 100644
--- a/src/arch/i386/boot/linuxbios_table.h
+++ b/src/arch/i386/boot/coreboot_table.h
@@ -1,7 +1,7 @@
 #ifndef COREBOOT_TABLE_H
 #define COREBOOT_TABLE_H
 
-#include <boot/linuxbios_tables.h>
+#include <boot/coreboot_tables.h>
 
 /* This file holds function prototypes for building the coreboot table. */
 unsigned long write_coreboot_table(
diff --git a/src/arch/i386/boot/tables.c b/src/arch/i386/boot/tables.c
index 417d9a98bb..0ff5c0ad2d 100644
--- a/src/arch/i386/boot/tables.c
+++ b/src/arch/i386/boot/tables.c
@@ -4,12 +4,12 @@
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <boot/tables.h>
-#include <boot/linuxbios_tables.h>
+#include <boot/coreboot_tables.h>
 #include <arch/pirq_routing.h>
 #include <arch/smp/mpspec.h>
 #include <arch/acpi.h>
 #include <string.h>
-#include "linuxbios_table.h"
+#include "coreboot_table.h"
 
 // Global Descriptor Table, defined in c_start.S
 extern uint8_t gdt;
diff --git a/src/arch/i386/llshell/readme.linuxbios b/src/arch/i386/llshell/readme.coreboot
similarity index 100%
rename from src/arch/i386/llshell/readme.linuxbios
rename to src/arch/i386/llshell/readme.coreboot
diff --git a/src/arch/ppc/boot/Config.lb b/src/arch/ppc/boot/Config.lb
index 284406c175..cac76ed3af 100644
--- a/src/arch/ppc/boot/Config.lb
+++ b/src/arch/ppc/boot/Config.lb
@@ -1,3 +1,3 @@
 object boot.o
 object tables.o
-object linuxbios_table.o
+object coreboot_table.o
diff --git a/src/arch/ppc/boot/linuxbios_table.c b/src/arch/ppc/boot/coreboot_table.c
similarity index 99%
rename from src/arch/ppc/boot/linuxbios_table.c
rename to src/arch/ppc/boot/coreboot_table.c
index 2758934e2e..ea6b683dbc 100644
--- a/src/arch/ppc/boot/linuxbios_table.c
+++ b/src/arch/ppc/boot/coreboot_table.c
@@ -1,7 +1,7 @@
 #include <console/console.h>
 #include <ip_checksum.h>
-#include <boot/linuxbios_tables.h>
-#include "linuxbios_table.h"
+#include <boot/coreboot_tables.h>
+#include "coreboot_table.h"
 #include <string.h>
 #include <version.h>
 #include <device/device.h>
diff --git a/src/arch/ppc/boot/linuxbios_table.h b/src/arch/ppc/boot/coreboot_table.h
similarity index 96%
rename from src/arch/ppc/boot/linuxbios_table.h
rename to src/arch/ppc/boot/coreboot_table.h
index 2f200912f6..2645dd5890 100644
--- a/src/arch/ppc/boot/linuxbios_table.h
+++ b/src/arch/ppc/boot/coreboot_table.h
@@ -1,7 +1,7 @@
 #ifndef COREBOOT_TABLE_H
 #define COREBOOT_TABLE_H
 
-#include <boot/linuxbios_tables.h>
+#include <boot/coreboot_tables.h>
 
 struct mem_range;
 
diff --git a/src/arch/ppc/boot/tables.c b/src/arch/ppc/boot/tables.c
index a9e1e8eb0f..00cc057277 100644
--- a/src/arch/ppc/boot/tables.c
+++ b/src/arch/ppc/boot/tables.c
@@ -1,8 +1,8 @@
 #include <console/console.h>
 #include <cpu/cpu.h>
 #include <boot/tables.h>
-#include <boot/linuxbios_tables.h>
-#include "linuxbios_table.h"
+#include <boot/coreboot_tables.h>
+#include "coreboot_table.h"
 
 struct lb_memory *
 write_tables(void)
diff --git a/src/boot/elfboot.c b/src/boot/elfboot.c
index cb8e1cf28d..f2c5975b11 100644
--- a/src/boot/elfboot.c
+++ b/src/boot/elfboot.c
@@ -2,7 +2,7 @@
 #include <part/fallback_boot.h>
 #include <boot/elf.h>
 #include <boot/elf_boot.h>
-#include <boot/linuxbios_tables.h>
+#include <boot/coreboot_tables.h>
 #include <ip_checksum.h>
 #include <stream/read_bytes.h>
 #include <stdint.h>
diff --git a/src/config/Config.lb b/src/config/Config.lb
index 76b44b7c65..e2daee3b45 100644
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -44,8 +44,8 @@ makerule coreboot_ram.o
 end
 
 makerule coreboot_ram
-	depends	"coreboot_ram.o $(TOP)/src/config/linuxbios_ram.ld ldoptions" 
-	action	"$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_ram.ld coreboot_ram.o"
+	depends	"coreboot_ram.o $(TOP)/src/config/coreboot_ram.ld ldoptions" 
+	action	"$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_ram.ld coreboot_ram.o"
 	action 	"$(CROSS_COMPILE)nm -n coreboot_ram | sort > coreboot_ram.map"
 end
 
@@ -87,8 +87,8 @@ if CONFIG_AP_CODE_IN_CAR
 	end
 
 	makerule coreboot_apc
-		depends "coreboot_apc.o $(TOP)/src/config/linuxbios_apc.ld ldoptions"
-		action  "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_apc.ld coreboot_apc.o"
+		depends "coreboot_apc.o $(TOP)/src/config/coreboot_apc.ld ldoptions"
+		action  "$(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/coreboot_apc.ld coreboot_apc.o"
 		action  "$(CROSS_COMPILE)nm -n coreboot_apc | sort > coreboot_apc.map"
 	end
 
@@ -174,7 +174,7 @@ makerule ./romcc
 end
 
 makerule build_opt_tbl   
-	depends	"$(TOP)/util/options/build_opt_tbl.c $(TOP)/src/include/pc80/mc146818rtc.h $(TOP)/src/include/boot/linuxbios_tables.h Makefile.settings Makefile"
+	depends	"$(TOP)/util/options/build_opt_tbl.c $(TOP)/src/include/pc80/mc146818rtc.h $(TOP)/src/include/boot/coreboot_tables.h Makefile.settings Makefile"
 	action	"$(HOSTCC) $(HOSTCFLAGS) $(CPUFLAGS) $< -o $@" 
 end
 
diff --git a/src/config/linuxbios_apc.ld b/src/config/coreboot_apc.ld
similarity index 100%
rename from src/config/linuxbios_apc.ld
rename to src/config/coreboot_apc.ld
diff --git a/src/config/linuxbios_ram.ld b/src/config/coreboot_ram.ld
similarity index 100%
rename from src/config/linuxbios_ram.ld
rename to src/config/coreboot_ram.ld
diff --git a/src/include/boot/linuxbios_tables.h b/src/include/boot/coreboot_tables.h
similarity index 100%
rename from src/include/boot/linuxbios_tables.h
rename to src/include/boot/coreboot_tables.h
diff --git a/src/include/boot/tables.h b/src/include/boot/tables.h
index 6c309b3c26..f9e91a4e18 100644
--- a/src/include/boot/tables.h
+++ b/src/include/boot/tables.h
@@ -1,7 +1,7 @@
 #ifndef BOOT_TABLES_H
 #define BOOT_TABLES_H
 
-#include <boot/linuxbios_tables.h>
+#include <boot/coreboot_tables.h>
 
 struct lb_memory *write_tables(void);
 
diff --git a/src/pc80/mc146818rtc.c b/src/pc80/mc146818rtc.c
index e182955e65..5da888071f 100644
--- a/src/pc80/mc146818rtc.c
+++ b/src/pc80/mc146818rtc.c
@@ -1,7 +1,7 @@
 #include <console/console.h>
 #include <arch/io.h>
 #include <pc80/mc146818rtc.h>
-#include <boot/linuxbios_tables.h>
+#include <boot/coreboot_tables.h>
 #include <string.h>
 
 #define CMOS_READ(addr) ({ \
diff --git a/util/lbtdump/lbtdump.c b/util/lbtdump/lbtdump.c
index 94288c4bfa..235aa21f15 100644
--- a/util/lbtdump/lbtdump.c
+++ b/util/lbtdump/lbtdump.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/mman.h>
-#include "../../src/include/boot/linuxbios_tables.h"
+#include "../../src/include/boot/coreboot_tables.h"
 
 void print_lb_records(struct lb_record *rec, struct lb_record *last, unsigned long addr);
 
diff --git a/util/options/build_opt_tbl.c b/util/options/build_opt_tbl.c
index 0a27c39e1d..d8e1b5d586 100644
--- a/util/options/build_opt_tbl.c
+++ b/util/options/build_opt_tbl.c
@@ -4,7 +4,7 @@
 #include <ctype.h>
 #include <errno.h>
 #include "../../src/include/pc80/mc146818rtc.h"
-#include "../../src/include/boot/linuxbios_tables.h"
+#include "../../src/include/boot/coreboot_tables.h"
 
 #define CMOS_IMAGE_BUFFER_SIZE 128
 #define INPUT_LINE_MAX 256