Rename almost all occurences of LinuxBIOS to coreboot.

Due to the automatic nature of this update, I am self-acking. It worked in
abuild.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3053 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

124 files changed, 425 insertions, 425 deletions

diff --git a/targets/a-trend/atc-6220/Config.lb b/targets/a-trend/atc-6220/Config.lb
index e14f152769..609110ffd9 100644
--- a/targets/a-trend/atc-6220/Config.lb
+++ b/targets/a-trend/atc-6220/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/advantech/pcm-5820/Config.lb b/targets/advantech/pcm-5820/Config.lb
index 4ec6829ad1..fe26b2b645 100644
--- a/targets/advantech/pcm-5820/Config.lb
+++ b/targets/advantech/pcm-5820/Config.lb
@@ -41,14 +41,14 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 9
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/agami/aruma/Config.lb b/targets/agami/aruma/Config.lb
index bbf9c45b48..fb570b9830 100644
--- a/targets/agami/aruma/Config.lb
+++ b/targets/agami/aruma/Config.lb
@@ -14,7 +14,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x17000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload ../../../../../../filo.elf
 end
 
@@ -22,7 +22,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x17000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload ../../../../../../filo.elf
 end
 
diff --git a/targets/agami/aruma/Config1M.lb b/targets/agami/aruma/Config1M.lb
index 47662a25a9..226e873cae 100644
--- a/targets/agami/aruma/Config1M.lb
+++ b/targets/agami/aruma/Config1M.lb
@@ -17,7 +17,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x14000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-big"
+	option COREBOOT_EXTRA_VERSION=".0-big"
 	payload ../../../../../../linux.elf
 end
 
diff --git a/targets/amd/db800/Config.lb b/targets/amd/db800/Config.lb
index be40fa9878..147d80f9de 100644
--- a/targets/amd/db800/Config.lb
+++ b/targets/amd/db800/Config.lb
@@ -42,7 +42,7 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 11
 romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf
 end
 
diff --git a/targets/amd/norwich/Config.lb b/targets/amd/norwich/Config.lb
index 82db2c178b..2830cac645 100644
--- a/targets/amd/norwich/Config.lb
+++ b/targets/amd/norwich/Config.lb
@@ -42,7 +42,7 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 11
 romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf
 end
 
diff --git a/targets/amd/rumba/Config.lb b/targets/amd/rumba/Config.lb
index e2083cc469..ee30902b8b 100644
--- a/targets/amd/rumba/Config.lb
+++ b/targets/amd/rumba/Config.lb
@@ -9,7 +9,7 @@ option ROM_SIZE=256*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -21,7 +21,7 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebia
@@ -30,4 +30,4 @@ romimage "fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/amd/rumba/Config.nofallback.lb b/targets/amd/rumba/Config.nofallback.lb
index 2d32a3650e..448df55652 100644
--- a/targets/amd/rumba/Config.nofallback.lb
+++ b/targets/amd/rumba/Config.nofallback.lb
@@ -11,7 +11,7 @@ option FALLBACK_SIZE=ROM_SIZE
 #romimage "normal"
 #	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x10000
-#	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+#	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -23,7 +23,7 @@ option FALLBACK_SIZE=ROM_SIZE
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebia
@@ -33,6 +33,6 @@ romimage "fallback"
 #	payload /home/ollie/work/filo-0.4.1/filo.elf
 end
 
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-buildrom ./linuxbios.rom ROM_SIZE "fallback"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "fallback"
 
diff --git a/targets/amd/serengeti_cheetah/Config-abuild.lb b/targets/amd/serengeti_cheetah/Config-abuild.lb
index 7d9e18310a..57bc20faf6 100644
--- a/targets/amd/serengeti_cheetah/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah/Config-abuild.lb
@@ -14,14 +14,14 @@ option ROM_SIZE=512*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/amd/serengeti_cheetah/Config.lb b/targets/amd/serengeti_cheetah/Config.lb
index aab9b385ee..25280ef29e 100644
--- a/targets/amd/serengeti_cheetah/Config.lb
+++ b/targets/amd/serengeti_cheetah/Config.lb
@@ -20,7 +20,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -48,7 +48,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -77,9 +77,9 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
diff --git a/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb b/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
index 93284fdf6f..3013c374af 100644
--- a/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
+++ b/targets/amd/serengeti_cheetah_fam10/Config-abuild.lb
@@ -14,7 +14,7 @@ option ROM_SIZE=1024*1024
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
 
@@ -23,7 +23,7 @@ romimage "failover"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=FAILOVER_SIZE
 	option XIP_ROM_SIZE=FAILOVER_SIZE
-	option LINUXBIOS_EXTRA_VERSION=".0-failover"
+	option COREBOOT_EXTRA_VERSION=".0-failover"
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "fallback" "failover"
\ No newline at end of file
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
\ No newline at end of file
diff --git a/targets/amd/serengeti_cheetah_fam10/Config.lb b/targets/amd/serengeti_cheetah_fam10/Config.lb
index 46601dd45b..18c558c82e 100644
--- a/targets/amd/serengeti_cheetah_fam10/Config.lb
+++ b/targets/amd/serengeti_cheetah_fam10/Config.lb
@@ -41,7 +41,7 @@ option ROM_SIZE=512*1024
 #	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x30000
 #	option XIP_ROM_SIZE=0x40000
-#	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+#	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #	payload ../payload.elf
 #end
 
@@ -53,7 +53,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x3f000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	payload ../payload.elf
 end
 
@@ -62,7 +62,7 @@ romimage "failover"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=FAILOVER_SIZE
 	option XIP_ROM_SIZE=FAILOVER_SIZE
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 #buildrom ./amd-cheetah-fam10.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/arima/hdama/Config-abuild.lb b/targets/arima/hdama/Config-abuild.lb
index 7d9e18310a..57bc20faf6 100644
--- a/targets/arima/hdama/Config-abuild.lb
+++ b/targets/arima/hdama/Config-abuild.lb
@@ -14,14 +14,14 @@ option ROM_SIZE=512*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/arima/hdama/Config.kernelimage.lb b/targets/arima/hdama/Config.kernelimage.lb
index 878489819d..fc17ea5e1d 100644
--- a/targets/arima/hdama/Config.kernelimage.lb
+++ b/targets/arima/hdama/Config.kernelimage.lb
@@ -48,7 +48,7 @@ uses MAINBOARD
 uses CONFIG_CHIP_CONFIGURE
 uses XIP_ROM_SIZE
 uses XIP_ROM_BASE
-uses LINUXBIOS_EXTRA_VERSION
+uses COREBOOT_EXTRA_VERSION
 
 option CONFIG_CHIP_CONFIGURE=1
 
@@ -73,17 +73,17 @@ option HAVE_FALLBACK_BOOT=1
 
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=ROM_SIZE
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 #
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 
 #
@@ -92,7 +92,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
 #	option ROM_SECTION_SIZE=0x100000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	mainboard arima/hdama
 #	payload ../../../../tg3--ide_disk.zelf
 	payload ../../../../opteron_phase1_p4_noapic
diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb
index 6c5cabcad1..038e38d63c 100644
--- a/targets/arima/hdama/Config.lb
+++ b/targets/arima/hdama/Config.lb
@@ -12,7 +12,7 @@ option ROM_SIZE=512*1024-36*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 	payload ../../../payloads/filo.elf
 #	payload /etc/hosts
 end
@@ -20,9 +20,9 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../../../payloads/filo.elf
 #	payload /etc/hosts
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/artecgroup/dbe61/Config.lb b/targets/artecgroup/dbe61/Config.lb
index 6a8478cc27..fbf472ea0f 100644
--- a/targets/artecgroup/dbe61/Config.lb
+++ b/targets/artecgroup/dbe61/Config.lb
@@ -9,7 +9,7 @@ option CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=1
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 option CONFIG_COMPRESSED_PAYLOAD_LZMA=0
 
-## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
+## ROM_SIZE is the total number of bytes allocated for coreboot use
 ## (normal AND fallback images and payloads).
 ## leave 36k for vsa and 32K for video ROM
 #option ROM_SIZE = 1024*256 - 36*1024 - 32 * 1024
@@ -17,7 +17,7 @@ option CONFIG_COMPRESSED_PAYLOAD_LZMA=0
 #No VGA for now
 option ROM_SIZE = 1024*512 - 36*1024
 
-# ROM_IMAGE_SIZE is the maximum number of bytes allowed for a LinuxBIOS image,
+# ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
 option ROM_IMAGE_SIZE=64*1024
 
@@ -27,7 +27,7 @@ option DEFAULT_CONSOLE_LOGLEVEL = 11
 option MAXIMUM_CONSOLE_LOGLEVEL = 11
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf
 end
 
diff --git a/targets/asi/mb_5blmp/Config.lb b/targets/asi/mb_5blmp/Config.lb
index 8f99c2370b..94462503a8 100644
--- a/targets/asi/mb_5blmp/Config.lb
+++ b/targets/asi/mb_5blmp/Config.lb
@@ -28,16 +28,16 @@ option ROM_SIZE = (256 * 1024)
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
 	option ROM_IMAGE_SIZE = 64 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
 	option ROM_IMAGE_SIZE = 64 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-# buildrom ./linuxbios.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+# buildrom ./coreboot.rom ROM_SIZE "fallback"
diff --git a/targets/asus/a8n_e/Config.lb b/targets/asus/a8n_e/Config.lb
index 14e8566756..0e23eaf7fa 100644
--- a/targets/asus/a8n_e/Config.lb
+++ b/targets/asus/a8n_e/Config.lb
@@ -27,7 +27,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="_Normal"
+	option COREBOOT_EXTRA_VERSION="_Normal"
 	payload /tmp/filo.elf
 end
 
@@ -36,7 +36,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="_Fallback"
+	option COREBOOT_EXTRA_VERSION="_Fallback"
 	payload /tmp/filo.elf
 end
 
@@ -45,8 +45,8 @@ romimage "failover"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=FAILOVER_SIZE
 	option XIP_ROM_SIZE=FAILOVER_SIZE
-	option LINUXBIOS_EXTRA_VERSION="_Failover"
+	option COREBOOT_EXTRA_VERSION="_Failover"
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/asus/a8v-e_se/Config.lb b/targets/asus/a8v-e_se/Config.lb
index 504e4bbaba..136f217a78 100644
--- a/targets/asus/a8v-e_se/Config.lb
+++ b/targets/asus/a8v-e_se/Config.lb
@@ -24,15 +24,15 @@ romimage "normal"
 	option ROM_SIZE = 512 * 1024
 	option USE_FALLBACK_IMAGE = 0
 	option ROM_IMAGE_SIZE = 128 * 1024
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
 	option ROM_IMAGE_SIZE = 128 * 1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/asus/mew-am/Config.lb b/targets/asus/mew-am/Config.lb
index 8546672faf..3aef3c0ea6 100644
--- a/targets/asus/mew-am/Config.lb
+++ b/targets/asus/mew-am/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/asus/mew-vm/Config.lb b/targets/asus/mew-vm/Config.lb
index 365015a2dd..b54ecaef3f 100644
--- a/targets/asus/mew-vm/Config.lb
+++ b/targets/asus/mew-vm/Config.lb
@@ -9,7 +9,7 @@ option ROM_SIZE = 512 * 1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /etc/hosts
 	payload /home/amp/filo-0.5/filo.elf
 end
@@ -17,9 +17,9 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /etc/hosts
 	payload /home/amp/filo-0.5/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/asus/p2b-f/Config.lb b/targets/asus/p2b-f/Config.lb
index cc6e0a1c16..48d29942d8 100644
--- a/targets/asus/p2b-f/Config.lb
+++ b/targets/asus/p2b-f/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/asus/p2b/Config.lb b/targets/asus/p2b/Config.lb
index fce6df5584..933d42bb06 100644
--- a/targets/asus/p2b/Config.lb
+++ b/targets/asus/p2b/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/asus/p3b-f/Config.lb b/targets/asus/p3b-f/Config.lb
index ebb4611361..b363187329 100644
--- a/targets/asus/p3b-f/Config.lb
+++ b/targets/asus/p3b-f/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/axus/tc320/Config.lb b/targets/axus/tc320/Config.lb
index b42e51456e..871fe9659a 100644
--- a/targets/axus/tc320/Config.lb
+++ b/targets/axus/tc320/Config.lb
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-## See also: http://linuxbios.org/AXUS_WINTERM_Build_Tutorial
+## See also: http://coreboot.org/AXUS_WINTERM_Build_Tutorial
 
 target tc320
 mainboard axus/tc320
@@ -38,14 +38,14 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 6
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload ../../../../../../../images/etherboot.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload ../../../../../../../images/etherboot.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/azza/pt-6ibd/Config.lb b/targets/azza/pt-6ibd/Config.lb
index d504234ecd..8daca27159 100644
--- a/targets/azza/pt-6ibd/Config.lb
+++ b/targets/azza/pt-6ibd/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/bcom/winnet100/Config.lb b/targets/bcom/winnet100/Config.lb
index 668f251e80..ec5210fe68 100644
--- a/targets/bcom/winnet100/Config.lb
+++ b/targets/bcom/winnet100/Config.lb
@@ -18,7 +18,7 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-## See also: http://www.linuxbios.org/BCOM_WINNET100_Build_Tutorial
+## See also: http://www.coreboot.org/BCOM_WINNET100_Build_Tutorial
 
 target winnet100
 mainboard bcom/winnet100
@@ -39,15 +39,15 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 6
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
 	option ROM_IMAGE_SIZE = 64 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload ../../../../../../../images/etherboot.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
 	option ROM_IMAGE_SIZE = 64 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload ../../../../../../../images/etherboot.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/biostar/m6tba/Config.lb b/targets/biostar/m6tba/Config.lb
index fb9e4c09e0..6439c4e926 100644
--- a/targets/biostar/m6tba/Config.lb
+++ b/targets/biostar/m6tba/Config.lb
@@ -37,14 +37,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/broadcom/blast/Config.lb b/targets/broadcom/blast/Config.lb
index 061a1cced2..e65ed1ec97 100644
--- a/targets/broadcom/blast/Config.lb
+++ b/targets/broadcom/blast/Config.lb
@@ -18,7 +18,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x15000
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -43,7 +43,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x15000
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -62,4 +62,4 @@ romimage "fallback"
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/buildtarget b/targets/buildtarget
index 7fce1e1497..f1a1a5a8df 100755
--- a/targets/buildtarget
+++ b/targets/buildtarget
@@ -3,7 +3,7 @@ PYTHON=python
 # Target build script
 
 if [ $# -lt 1 ]; then
-	echo "usage: buildtarget target [path-to-linuxbios]"
+	echo "usage: buildtarget target [path-to-coreboot]"
 	exit 1
 fi
 
@@ -44,7 +44,7 @@ if [ ! -d $build_dir ] ; then
 	mkdir -p $build_dir
 fi
 if [ ! -f $config_py ]; then
-	echo "No linuxbios config script found. Rebuilding it.."
+	echo "No coreboot config script found. Rebuilding it.."
 	$PYTHON $yapps2_py $config_g $config_py
 fi
 
diff --git a/targets/compaq/deskpro_en_sff_p600/Config.lb b/targets/compaq/deskpro_en_sff_p600/Config.lb
index 3f484d367b..c14ae1d067 100644
--- a/targets/compaq/deskpro_en_sff_p600/Config.lb
+++ b/targets/compaq/deskpro_en_sff_p600/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/dell/s1850/Config.lb b/targets/dell/s1850/Config.lb
index 2302608501..45227cb85c 100644
--- a/targets/dell/s1850/Config.lb
+++ b/targets/dell/s1850/Config.lb
@@ -8,7 +8,7 @@ option DEFAULT_CONSOLE_LOGLEVEL=10
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x16000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload ../../../payloads/filo.elf
 	payload /tmp/filo.elf
 end
@@ -16,9 +16,9 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x16000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload ../../../payloads/filo.elf
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/digitallogic/adl855pc/Config.lb b/targets/digitallogic/adl855pc/Config.lb
index 126bc0d5ad..1679106998 100644
--- a/targets/digitallogic/adl855pc/Config.lb
+++ b/targets/digitallogic/adl855pc/Config.lb
@@ -9,15 +9,15 @@ option MAXIMUM_CONSOLE_LOGLEVEL=10
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 	payload /etc/hosts
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /etc/hosts
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/digitallogic/msm586seg/Config-abuild.lb b/targets/digitallogic/msm586seg/Config-abuild.lb
index 2336b26599..13de22f150 100644
--- a/targets/digitallogic/msm586seg/Config-abuild.lb
+++ b/targets/digitallogic/msm586seg/Config-abuild.lb
@@ -19,8 +19,8 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=32 * 1024 # 0x8000
 	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
 #	option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/digitallogic/msm586seg/Config.lb b/targets/digitallogic/msm586seg/Config.lb
index 7624933dc2..565434c238 100644
--- a/targets/digitallogic/msm586seg/Config.lb
+++ b/targets/digitallogic/msm586seg/Config.lb
@@ -12,7 +12,7 @@ option CONFIG_CONSOLE_VGA=0
 #romimage "normal"
 #	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x10000
-#	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+#	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /etc/hosts
 #end
 
@@ -24,9 +24,9 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=32 * 1024 # 0x8000
 	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
 #	option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../../filo.elf
 #	payload ../../eepro100--ide_disk.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/digitallogic/msm800sev/Config.lb b/targets/digitallogic/msm800sev/Config.lb
index b2ca7ed7b6..37d8d8a3eb 100644
--- a/targets/digitallogic/msm800sev/Config.lb
+++ b/targets/digitallogic/msm800sev/Config.lb
@@ -5,13 +5,13 @@ mainboard digitallogic/msm800sev
 
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 
-## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
+## ROM_SIZE is the total number of bytes allocated for coreboot use
 ## (normal AND fallback images and payloads).
 ## leave 36k for vsa 
 ##
 option ROM_SIZE = 1024*1024 - 36 * 1024
 
-## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a LinuxBIOS image,
+## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
 option ROM_IMAGE_SIZE=64*1024
 
@@ -21,8 +21,8 @@ option DEFAULT_CONSOLE_LOGLEVEL = 11
 option MAXIMUM_CONSOLE_LOGLEVEL = 11
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload ../payload.elf 
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/eaglelion/5bcm/Config.lb b/targets/eaglelion/5bcm/Config.lb
index 9071ad33d4..b237190ad9 100644
--- a/targets/eaglelion/5bcm/Config.lb
+++ b/targets/eaglelion/5bcm/Config.lb
@@ -9,7 +9,7 @@ option ROM_SIZE=256*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -20,7 +20,7 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebia
@@ -28,4 +28,4 @@ romimage "fallback"
 	payload /home/hamish/work/etherboot/eb-5.2.6-lne100.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/embeddedplanet/ep405pc/Config.lb b/targets/embeddedplanet/ep405pc/Config.lb
index 659c7c276f..ba794badf6 100644
--- a/targets/embeddedplanet/ep405pc/Config.lb
+++ b/targets/embeddedplanet/ep405pc/Config.lb
@@ -43,7 +43,7 @@ romimage "normal"
         ## Board has fixed size RAM
         option EMBEDDED_RAM_SIZE=64*1024*1024
 
-        ## LinuxBIOS C code runs at this location in RAM
+        ## Coreboot C code runs at this location in RAM
         option _RAMBASE=0x00100000
 
         ##
@@ -70,12 +70,12 @@ romimage "normal"
 	## Exception vectors
 	option _EXCEPTION_VECTORS=_ROMBASE+0x100
 
-	## linuxBIOS ROM start address
+	## coreboot ROM start address
 	option _ROMSTART=0xfff03000
 
-	## linuxBIOS C code runs at this location in RAM
+	## coreboot C code runs at this location in RAM
 	option _RAMBASE=0x00100000
 
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal"
+buildrom ./coreboot.rom ROM_SIZE "normal"
diff --git a/targets/emulation/qemu-i386/Config-abuild.lb b/targets/emulation/qemu-i386/Config-abuild.lb
index c2ec536235..12a64cbd0c 100644
--- a/targets/emulation/qemu-i386/Config-abuild.lb
+++ b/targets/emulation/qemu-i386/Config-abuild.lb
@@ -14,7 +14,7 @@ option IRQ_SLOT_COUNT=6
 
 romimage "image" 
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION="-OpenBIOS"
+	option COREBOOT_EXTRA_VERSION="-OpenBIOS"
 	payload __PAYLOAD__
 end
 
diff --git a/targets/emulation/qemu-i386/Config.OLPC.lb b/targets/emulation/qemu-i386/Config.OLPC.lb
index 255a520898..15c58ed214 100644
--- a/targets/emulation/qemu-i386/Config.OLPC.lb
+++ b/targets/emulation/qemu-i386/Config.OLPC.lb
@@ -14,9 +14,9 @@ option IRQ_SLOT_COUNT=6
 
 romimage "image" 
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION="-OpenBIOS"
+	option COREBOOT_EXTRA_VERSION="-OpenBIOS"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "image"
+buildrom ./coreboot.rom ROM_SIZE "image"
 
diff --git a/targets/emulation/qemu-i386/Config.lb b/targets/emulation/qemu-i386/Config.lb
index cf4e773252..983d5039d8 100644
--- a/targets/emulation/qemu-i386/Config.lb
+++ b/targets/emulation/qemu-i386/Config.lb
@@ -12,7 +12,7 @@ option IRQ_SLOT_COUNT=6
 
 romimage "image" 
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION="-GRUB2"
+	option COREBOOT_EXTRA_VERSION="-GRUB2"
 	payload /home/stepan/core.img
 end
 
diff --git a/targets/gigabyte/ga-6bxc/Config.lb b/targets/gigabyte/ga-6bxc/Config.lb
index cf165cad51..12f259087c 100644
--- a/targets/gigabyte/ga-6bxc/Config.lb
+++ b/targets/gigabyte/ga-6bxc/Config.lb
@@ -36,14 +36,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
index f5aba7984a..463503be69 100644
--- a/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config-abuild.lb
@@ -30,7 +30,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x28000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
@@ -39,7 +39,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload __PAYLOAD__
 end
 
@@ -48,8 +48,8 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION=".0-Failover"
+        option COREBOOT_EXTRA_VERSION=".0-Failover"
 end
 
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/gigabyte/ga_2761gxdk/Config.lb b/targets/gigabyte/ga_2761gxdk/Config.lb
index 91e705830e..1016f3a717 100644
--- a/targets/gigabyte/ga_2761gxdk/Config.lb
+++ b/targets/gigabyte/ga_2761gxdk/Config.lb
@@ -31,7 +31,7 @@ romimage "normal"
         option USE_FAILOVER_IMAGE=0
         option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x40000
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
         payload ../../../../payloads/filo_uda1.elf
 end
 
@@ -40,7 +40,7 @@ romimage "fallback"
         option USE_FALLBACK_IMAGE=1
         option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x40000
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
         payload ../../../../payloads/filo_uda1.elf
 end
 
@@ -49,8 +49,8 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-#       buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-        buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+#       buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+        buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/gigabyte/ga_2761gxdk/README b/targets/gigabyte/ga_2761gxdk/README
index ef9cd5a707..ed850d8632 100644
--- a/targets/gigabyte/ga_2761gxdk/README
+++ b/targets/gigabyte/ga_2761gxdk/README
@@ -1,3 +1,3 @@
 ## How to append VGA bios?
 
-cat 6330VGA.rom ga_2761gxdk/linuxbios.rom > ga_2761gxdk.bin
+cat 6330VGA.rom ga_2761gxdk/coreboot.rom > ga_2761gxdk.bin
diff --git a/targets/gigabyte/m57sli/Config-abuild.lb b/targets/gigabyte/m57sli/Config-abuild.lb
index 7837a7b0b0..18cad76c24 100644
--- a/targets/gigabyte/m57sli/Config-abuild.lb
+++ b/targets/gigabyte/m57sli/Config-abuild.lb
@@ -27,7 +27,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
@@ -35,8 +35,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/gigabyte/m57sli/Config.lb b/targets/gigabyte/m57sli/Config.lb
index ce2e43d2cb..75adcfc244 100644
--- a/targets/gigabyte/m57sli/Config.lb
+++ b/targets/gigabyte/m57sli/Config.lb
@@ -39,7 +39,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -67,7 +67,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -97,8 +97,8 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/gigabyte/m57sli/Config.lb.kernel b/targets/gigabyte/m57sli/Config.lb.kernel
index 1f601e97cc..6485e6c461 100644
--- a/targets/gigabyte/m57sli/Config.lb.kernel
+++ b/targets/gigabyte/m57sli/Config.lb.kernel
@@ -37,7 +37,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x15800
 #	option ROM_IMAGE_SIZE=0x13800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -69,9 +69,9 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./linuxbios.rom ROM_SIZE "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
diff --git a/targets/ibm/e325/Config.lb b/targets/ibm/e325/Config.lb
index 3cf0551ed2..8e492d5a53 100644
--- a/targets/ibm/e325/Config.lb
+++ b/targets/ibm/e325/Config.lb
@@ -8,7 +8,7 @@ mainboard ibm/e325
 #
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 
 #
@@ -16,7 +16,7 @@ mainboard ibm/e325
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
 end
@@ -24,11 +24,11 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
 # use this to test a build if you don't have the etherboot
 #	payload /etc/hosts
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/ibm/e326/Config-abuild.lb b/targets/ibm/e326/Config-abuild.lb
index 7d9e18310a..57bc20faf6 100644
--- a/targets/ibm/e326/Config-abuild.lb
+++ b/targets/ibm/e326/Config-abuild.lb
@@ -14,14 +14,14 @@ option ROM_SIZE=512*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/ibm/e326/Config.lb b/targets/ibm/e326/Config.lb
index 53aaca5695..8129dd6ab5 100644
--- a/targets/ibm/e326/Config.lb
+++ b/targets/ibm/e326/Config.lb
@@ -6,13 +6,13 @@ mainboard ibm/e326
 
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
 end
@@ -20,11 +20,11 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload ../../filo.elf
 	payload ../../../payloads/filo.elf
 # use this to test a build if you don't have the etherboot
 #	payload /etc/hosts
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/iei/juki-511p/Config-abuild.lb b/targets/iei/juki-511p/Config-abuild.lb
index 7f39f41364..c7602b3b2a 100644
--- a/targets/iei/juki-511p/Config-abuild.lb
+++ b/targets/iei/juki-511p/Config-abuild.lb
@@ -8,22 +8,22 @@ __COMPRESSION__
 option ROM_SIZE=256*1024
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=128*1024
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/iei/juki-511p/Config.lb b/targets/iei/juki-511p/Config.lb
index 3a17702c9f..5015562285 100644
--- a/targets/iei/juki-511p/Config.lb
+++ b/targets/iei/juki-511p/Config.lb
@@ -30,8 +30,8 @@ option CONFIG_PRECOMPRESSED_PAYLOAD=0
 
 romimage "image"
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION="-filo"
+	option COREBOOT_EXTRA_VERSION="-filo"
 	payload ../../filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "image"
+buildrom ./coreboot.rom ROM_SIZE "image"
diff --git a/targets/iei/nova4899r/Config.lb b/targets/iei/nova4899r/Config.lb
index 3598b5b6c8..ec2e76f588 100644
--- a/targets/iei/nova4899r/Config.lb
+++ b/targets/iei/nova4899r/Config.lb
@@ -39,9 +39,9 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 8
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
-	payload /opt/linuxbios-SVN/filo.elf
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
+	payload /opt/coreboot-SVN/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "fallback"
+buildrom ./coreboot.rom ROM_SIZE "fallback"
 #"normal" 
diff --git a/targets/intel/xe7501devkit/Config.lb b/targets/intel/xe7501devkit/Config.lb
index 9660d0ebff..b421f1b005 100644
--- a/targets/intel/xe7501devkit/Config.lb
+++ b/targets/intel/xe7501devkit/Config.lb
@@ -1,11 +1,11 @@
 target xe7501devkit
 mainboard intel/xe7501devkit
 
-## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
+## ROM_SIZE is the total number of bytes allocated for coreboot use
 ## (normal AND fallback images and payloads).
 option ROM_SIZE = 192*1024
 
-## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a LinuxBIOS image,
+## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
 option ROM_IMAGE_SIZE = 0x1B000
 
@@ -17,7 +17,7 @@ option FALLBACK_SIZE = 0
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
-#	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+#	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../../../../../memtest86/memtest
 #       payload ../../../../../../../etherboot/src/bin/e1000.zelf
         payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
@@ -28,10 +28,10 @@ end
 #      Thus no support for fallback boot.
 #romimage "fallback" 
 #	option USE_FALLBACK_IMAGE=1
-#	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+#	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../../../../../memtest86/memtest
 #       payload ../../../../../../../etherboot/src/bin/e1000.zelf
 #       payload ../../../../../../../etherboot/src/bin/e1000--filo.zelf
 #end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal"
+buildrom ./coreboot.rom ROM_SIZE "normal"
diff --git a/targets/iwill/dk8_htx/Config-abuild.lb b/targets/iwill/dk8_htx/Config-abuild.lb
index e29e66c7f7..8332de0f18 100644
--- a/targets/iwill/dk8_htx/Config-abuild.lb
+++ b/targets/iwill/dk8_htx/Config-abuild.lb
@@ -12,14 +12,14 @@ option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x17000
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x17000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/iwill/dk8_htx/Config.lb b/targets/iwill/dk8_htx/Config.lb
index 3433784dcf..842bd3d021 100644
--- a/targets/iwill/dk8_htx/Config.lb
+++ b/targets/iwill/dk8_htx/Config.lb
@@ -17,7 +17,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x15800
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -43,7 +43,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x15800
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -67,8 +67,8 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/iwill/dk8s2/Config.lb b/targets/iwill/dk8s2/Config.lb
index ced9197fd5..3f18f54b9a 100644
--- a/targets/iwill/dk8s2/Config.lb
+++ b/targets/iwill/dk8s2/Config.lb
@@ -57,18 +57,18 @@ option MAINBOARD_VENDOR="IWILL"
 #
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 #option FALLBACK_SIZE=524288
 #option FALLBACK_SIZE=98304
 option FALLBACK_SIZE=131072
 
-## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
+## ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
 option ROM_IMAGE_SIZE=65536
  
 
 ###
-### Compute where this copy of linuxBIOS will start in the boot rom
+### Compute where this copy of coreboot will start in the boot rom
 ###
 #
 ###
@@ -80,7 +80,7 @@ option CONFIG_CONSOLE_SERIAL8250=1
 option TTYS0_BAUD=115200
 
 ##
-### Select the linuxBIOS loglevel
+### Select the coreboot loglevel
 ##
 ## EMERG      1   system is unusable
 ## ALERT      2   action must be taken immediately
@@ -101,7 +101,7 @@ option MAXIMUM_CONSOLE_LOGLEVEL=7
 
 #
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x004000
 
 ##
@@ -117,7 +117,7 @@ option HEAP_SIZE=0xe000
 #
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 option CONFIG_ROM_PAYLOAD     = 1
 
@@ -128,7 +128,7 @@ romimage "normal"
 #        option ROM_SIZE = 512*1024-48*1024
 #	48K for SCSI FW and 48K for ATI ROM
 #	option ROM_SIZE = 512*1024-48*1024-48*1024
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
 	option ROM_SECTION_OFFSET= 0
@@ -147,7 +147,7 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_SECTION_SIZE  = FALLBACK_SIZE
 	option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
@@ -164,4 +164,4 @@ romimage "fallback"
 #	payload /usr/src/filo-0.4.2/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/iwill/dk8x/Config.lb b/targets/iwill/dk8x/Config.lb
index 9ae39be8e8..c51b7c52ac 100644
--- a/targets/iwill/dk8x/Config.lb
+++ b/targets/iwill/dk8x/Config.lb
@@ -57,18 +57,18 @@ option MAINBOARD_VENDOR="IWILL"
 #
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 #option FALLBACK_SIZE=524288
 #option FALLBACK_SIZE=98304
 option FALLBACK_SIZE=131072
 
-## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
+## ROM_IMAGE_SIZE is the amount of space to allow coreboot to occupy.
 option ROM_IMAGE_SIZE=65536
  
 
 ###
-### Compute where this copy of linuxBIOS will start in the boot rom
+### Compute where this copy of coreboot will start in the boot rom
 ###
 #
 ###
@@ -80,7 +80,7 @@ option CONFIG_CONSOLE_SERIAL8250=1
 option TTYS0_BAUD=115200
 
 ##
-### Select the linuxBIOS loglevel
+### Select the coreboot loglevel
 ##
 ## EMERG      1   system is unusable
 ## ALERT      2   action must be taken immediately
@@ -101,7 +101,7 @@ option MAXIMUM_CONSOLE_LOGLEVEL=7
 
 #
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x004000
 
 ##
@@ -117,7 +117,7 @@ option HEAP_SIZE=0xe000
 #
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 option CONFIG_ROM_PAYLOAD     = 1
 
@@ -128,7 +128,7 @@ romimage "normal"
 #        option ROM_SIZE = 512*1024-48*1024
 #	48K for SCSI FW and 48K for ATI ROM
 #	option ROM_SIZE = 512*1024-48*1024-48*1024
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_SECTION_SIZE  = (ROM_SIZE - FALLBACK_SIZE)
 	option ROM_SECTION_OFFSET= 0
@@ -147,7 +147,7 @@ romimage "normal"
 end
 
 romimage "fallback" 
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_SECTION_SIZE  = FALLBACK_SIZE
 	option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
@@ -164,4 +164,4 @@ romimage "fallback"
 #	payload /usr/src/filo-0.4.2/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/lippert/frontrunner/Config.lb b/targets/lippert/frontrunner/Config.lb
index 6b29b5aa0f..e2162685cf 100644
--- a/targets/lippert/frontrunner/Config.lb
+++ b/targets/lippert/frontrunner/Config.lb
@@ -9,7 +9,7 @@ option ROM_SIZE=256*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x16000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -21,7 +21,7 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x16000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebia
@@ -30,4 +30,4 @@ romimage "fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/momentum/apache/Config.lb b/targets/momentum/apache/Config.lb
index 220c791ae2..f3d3d6da3d 100644
--- a/targets/momentum/apache/Config.lb
+++ b/targets/momentum/apache/Config.lb
@@ -16,13 +16,13 @@ romimage "normal"
 	## Exception vectors (other than reset vector)
 	option _EXCEPTION_VECTORS=_RESET+0x100
 
-	## Start of linuxBIOS in the boot rom
+	## Start of coreboot in the boot rom
 	## = _RESET + exeception vector table size
 	option _ROMSTART=_RESET+0x3100
 
-	## LinuxBIOS C code runs at this location in RAM
+	## Coreboot C code runs at this location in RAM
 	option _RAMBASE=0x00100000
 	option _RAMSTART=0x00100000
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal"
+buildrom ./coreboot.rom ROM_SIZE "normal"
diff --git a/targets/motorola/sandpoint/Config.lb b/targets/motorola/sandpoint/Config.lb
index 398fa9e11b..d70562328f 100644
--- a/targets/motorola/sandpoint/Config.lb
+++ b/targets/motorola/sandpoint/Config.lb
@@ -17,15 +17,15 @@ romimage "normal"
 	## Exception vectors (other than reset vector)
 	option _EXCEPTION_VECTORS=_RESET+0x100
 
-	## Start of linuxBIOS in the boot rom
+	## Start of coreboot in the boot rom
 	## = _RESET + exeception vector table size
 	option _ROMSTART=_RESET+0x3100
 
-	## LinuxBIOS C code runs at this location in RAM
+	## Coreboot C code runs at this location in RAM
 	option _RAMBASE=0x00100000
 	option _RAMSTART=0x00100000
 
 	option CONFIG_SANDPOINT_ALTIMUS=1
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal"
+buildrom ./coreboot.rom ROM_SIZE "normal"
diff --git a/targets/motorola/sandpoint/Config.lb.ide_stream b/targets/motorola/sandpoint/Config.lb.ide_stream
index 85b5c7792a..04b2591584 100644
--- a/targets/motorola/sandpoint/Config.lb.ide_stream
+++ b/targets/motorola/sandpoint/Config.lb.ide_stream
@@ -74,11 +74,11 @@ romimage "normal"
 	## Exception vectors (other than reset vector)
 	option _EXCEPTION_VECTORS=_RESET+0x100
 
-	## Start of linuxBIOS in the boot rom
+	## Start of coreboot in the boot rom
 	## = _RESET + exeception vector table size
 	option _ROMSTART=_RESET+0x3100
 
-	## LinuxBIOS C code runs at this location in RAM
+	## Coreboot C code runs at this location in RAM
 	option _RAMBASE=0x00100000
 	option _RAMSTART=0x00100000
 
@@ -87,4 +87,4 @@ romimage "normal"
 	mainboard motorola/sandpoint
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal"
+buildrom ./coreboot.rom ROM_SIZE "normal"
diff --git a/targets/msi/ms6178/Config.lb b/targets/msi/ms6178/Config.lb
index 6e44235dfa..6c5f058827 100644
--- a/targets/msi/ms6178/Config.lb
+++ b/targets/msi/ms6178/Config.lb
@@ -37,14 +37,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/msi/ms7260/Config-abuild.lb b/targets/msi/ms7260/Config-abuild.lb
index e112d480bd..c0f6f142a4 100644
--- a/targets/msi/ms7260/Config-abuild.lb
+++ b/targets/msi/ms7260/Config-abuild.lb
@@ -28,7 +28,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
 	option ROM_IMAGE_SIZE = 128 * 1024
 	option XIP_ROM_SIZE = 256 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload __PAYLOAD__
 end
 
@@ -37,7 +37,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
 	option ROM_IMAGE_SIZE = 128 * 1024
 	option XIP_ROM_SIZE = 256 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload __PAYLOAD__
 end
 
@@ -46,8 +46,8 @@ romimage "failover"
 	option USE_FALLBACK_IMAGE = 0
 	option ROM_IMAGE_SIZE = FAILOVER_SIZE
 	option XIP_ROM_SIZE = FAILOVER_SIZE
-	option LINUXBIOS_EXTRA_VERSION = ".0Failover"
+	option COREBOOT_EXTRA_VERSION = ".0Failover"
 end
 
-# buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+# buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/msi/ms7260/Config.lb b/targets/msi/ms7260/Config.lb
index 373ddad463..23f6819a43 100644
--- a/targets/msi/ms7260/Config.lb
+++ b/targets/msi/ms7260/Config.lb
@@ -31,7 +31,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
 	option ROM_IMAGE_SIZE = 128 * 1024
 	option XIP_ROM_SIZE = 256 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
@@ -40,7 +40,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
 	option ROM_IMAGE_SIZE = 128 * 1024
 	option XIP_ROM_SIZE = 256 * 1024
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
@@ -49,8 +49,8 @@ romimage "failover"
 	option USE_FALLBACK_IMAGE = 0
 	option ROM_IMAGE_SIZE = FAILOVER_SIZE
 	option XIP_ROM_SIZE = FAILOVER_SIZE
-	option LINUXBIOS_EXTRA_VERSION = ".0Failover"
+	option COREBOOT_EXTRA_VERSION = ".0Failover"
 end
 
-# buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+# buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/msi/ms9185/Config-abuild.lb b/targets/msi/ms9185/Config-abuild.lb
index b536ca8a3b..e3be361e2c 100644
--- a/targets/msi/ms9185/Config-abuild.lb
+++ b/targets/msi/ms9185/Config-abuild.lb
@@ -12,14 +12,14 @@ __COMPRESSION__
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE = 96 * 1024
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE = 96 * 1024
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/msi/ms9185/Config.lb b/targets/msi/ms9185/Config.lb
index 21ed6e51b9..c065ff6122 100644
--- a/targets/msi/ms9185/Config.lb
+++ b/targets/msi/ms9185/Config.lb
@@ -40,7 +40,7 @@ romimage "normal"
        option ROM_IMAGE_SIZE=0x20000
 #      option ROM_IMAGE_SIZE=0x15800
        option XIP_ROM_SIZE=0x40000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+       option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -68,7 +68,7 @@ romimage "fallback"
        option ROM_IMAGE_SIZE=0x20000
 #      option ROM_IMAGE_SIZE=0x15800
        option XIP_ROM_SIZE=0x40000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+       option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
diff --git a/targets/msi/ms9282/Config-abuild.lb b/targets/msi/ms9282/Config-abuild.lb
index b536ca8a3b..e3be361e2c 100644
--- a/targets/msi/ms9282/Config-abuild.lb
+++ b/targets/msi/ms9282/Config-abuild.lb
@@ -12,14 +12,14 @@ __COMPRESSION__
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE = 96 * 1024
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE = 96 * 1024
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/msi/ms9282/Config.lb b/targets/msi/ms9282/Config.lb
index 78e8b35a7b..7c716184c1 100644
--- a/targets/msi/ms9282/Config.lb
+++ b/targets/msi/ms9282/Config.lb
@@ -37,7 +37,7 @@ romimage "normal"
        option ROM_IMAGE_SIZE=0x20000
 #      option ROM_IMAGE_SIZE=0x15800
        option XIP_ROM_SIZE=0x40000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+       option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -65,7 +65,7 @@ romimage "fallback"
        option ROM_IMAGE_SIZE=0x20000
 #      option ROM_IMAGE_SIZE=0x15800
        option XIP_ROM_SIZE=0x40000
-       option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+       option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
diff --git a/targets/newisys/khepri/Config.lb b/targets/newisys/khepri/Config.lb
index a6ffad22b9..fc7f2fcfe1 100644
--- a/targets/newisys/khepri/Config.lb
+++ b/targets/newisys/khepri/Config.lb
@@ -25,20 +25,20 @@ option HAVE_FALLBACK_BOOT=1
 
 option FALLBACK_SIZE=131072
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="-Khepri-Normal"
+	option COREBOOT_EXTRA_VERSION="-Khepri-Normal"
 	payload ../../../payloads/tg3--ide_disk.zelf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="-Khepri-Fallback"
+	option COREBOOT_EXTRA_VERSION="-Khepri-Fallback"
 	payload ../../../payloads/tg3--ide_disk.zelf
 end
 
diff --git a/targets/nvidia/l1_2pvv/Config-abuild.lb b/targets/nvidia/l1_2pvv/Config-abuild.lb
index 4c18a45999..5026ac4b3a 100644
--- a/targets/nvidia/l1_2pvv/Config-abuild.lb
+++ b/targets/nvidia/l1_2pvv/Config-abuild.lb
@@ -27,7 +27,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
@@ -35,8 +35,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/nvidia/l1_2pvv/Config.lb b/targets/nvidia/l1_2pvv/Config.lb
index 18fb6cc8ee..c6d546ed83 100644
--- a/targets/nvidia/l1_2pvv/Config.lb
+++ b/targets/nvidia/l1_2pvv/Config.lb
@@ -43,7 +43,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -71,7 +71,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -101,8 +101,8 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/nvidia/l1_2pvv/Config.lb.kernel b/targets/nvidia/l1_2pvv/Config.lb.kernel
index 6c6ed52ee4..a0a16cf53e 100644
--- a/targets/nvidia/l1_2pvv/Config.lb.kernel
+++ b/targets/nvidia/l1_2pvv/Config.lb.kernel
@@ -39,7 +39,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x15800
 #	option ROM_IMAGE_SIZE=0x13800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -71,9 +71,9 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./linuxbios.rom ROM_SIZE "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
diff --git a/targets/olpc/btest/Config.lb b/targets/olpc/btest/Config.lb
index 66b1360457..3789519f91 100644
--- a/targets/olpc/btest/Config.lb
+++ b/targets/olpc/btest/Config.lb
@@ -3,7 +3,7 @@
 target btest
 mainboard olpc/btest
 
-# Don't let LinuxBIOS compress the payload
+# Don't let coreboot compress the payload
 #option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 #option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 #option CONFIG_PRECOMPRESSED_PAYLOAD=0
@@ -17,8 +17,8 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 3
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=32*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/olpc/rev_a/Config.1M.lb b/targets/olpc/rev_a/Config.1M.lb
index 507d7da595..ad26d46f7f 100644
--- a/targets/olpc/rev_a/Config.1M.lb
+++ b/targets/olpc/rev_a/Config.1M.lb
@@ -3,7 +3,7 @@
 target rev_a_1M
 mainboard olpc/rev_a
 
-# Don't let LinuxBIOS compress the payload
+# Don't let coreboot compress the payload
 # option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 #option CONFIG_PRECOMPRESSED_PAYLOAD=1
 
@@ -16,8 +16,8 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 11
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=32*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/olpc/rev_a/Config.SPI.lb b/targets/olpc/rev_a/Config.SPI.lb
index 3b8d5be23f..66a720f038 100644
--- a/targets/olpc/rev_a/Config.SPI.lb
+++ b/targets/olpc/rev_a/Config.SPI.lb
@@ -3,7 +3,7 @@
 target rev_a_1M
 mainboard olpc/rev_a
 
-# Don't let LinuxBIOS compress the payload
+# Don't let coreboot compress the payload
 #option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 #option CONFIG_COMPRESSED_PAYLOAD_LZMA=1
 #option CONFIG_PRECOMPRESSED_PAYLOAD=0
@@ -17,8 +17,8 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 11
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=32*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/olpc/rev_a/Config.kernel.lb b/targets/olpc/rev_a/Config.kernel.lb
index 0509c7f39a..ed612f7e90 100644
--- a/targets/olpc/rev_a/Config.kernel.lb
+++ b/targets/olpc/rev_a/Config.kernel.lb
@@ -9,7 +9,7 @@ option FALLBACK_SIZE=ROM_SIZE
 #romimage "normal"
 #	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x10000
-#	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+#	option COREBOOT_EXTRA_VERSION=".0Normal"
 ##	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 ##	payload ../../../../tg3--ide_disk.zelf	
 ##	payload ../../../../../lnxieepro100.ebi
@@ -21,7 +21,7 @@ option FALLBACK_SIZE=ROM_SIZE
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebia
@@ -31,5 +31,5 @@ romimage "fallback"
 	payload /tmp/olpc
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/olpc/rev_a/Config.lb b/targets/olpc/rev_a/Config.lb
index af2e4e07d1..91fa0c64d0 100644
--- a/targets/olpc/rev_a/Config.lb
+++ b/targets/olpc/rev_a/Config.lb
@@ -13,8 +13,8 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 11
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=32*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload /tmp/olpcpayload.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/pcengines/alix1c/Config.lb b/targets/pcengines/alix1c/Config.lb
index 02ac933531..5a620b27c0 100644
--- a/targets/pcengines/alix1c/Config.lb
+++ b/targets/pcengines/alix1c/Config.lb
@@ -3,11 +3,11 @@ mainboard pcengines/alix1c
 
 option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 
-## ROM_SIZE is the total number of bytes allocated for LinuxBIOS use
+## ROM_SIZE is the total number of bytes allocated for coreboot use
 ## (normal AND fallback images and payloads). Leave 36k for VSA.
 option ROM_SIZE = (512 * 1024) - (36 * 1024)
 
-## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a LinuxBIOS image,
+## ROM_IMAGE_SIZE is the maximum number of bytes allowed for a coreboot image,
 ## not including any payload.
 option ROM_IMAGE_SIZE = (64 * 1024)
 
@@ -18,8 +18,8 @@ option MAXIMUM_CONSOLE_LOGLEVEL = 11
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload ../payload.elf 
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/sunw/ultra40/Config.lb b/targets/sunw/ultra40/Config.lb
index 8edcff4cf1..4761b3e037 100644
--- a/targets/sunw/ultra40/Config.lb
+++ b/targets/sunw/ultra40/Config.lb
@@ -23,7 +23,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -52,7 +52,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -70,4 +70,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/supermicro/h8dmr/Config-abuild.lb b/targets/supermicro/h8dmr/Config-abuild.lb
index 8aec0d0ad4..0b6bad7269 100644
--- a/targets/supermicro/h8dmr/Config-abuild.lb
+++ b/targets/supermicro/h8dmr/Config-abuild.lb
@@ -13,7 +13,7 @@ romimage "normal"
         option USE_FAILOVER_IMAGE=0
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x18000
-	option LINUXBIOS_EXTRA_VERSION=".0-normal"
+	option COREBOOT_EXTRA_VERSION=".0-normal"
 	payload __PAYLOAD__
 end
 
@@ -21,7 +21,7 @@ romimage "fallback"
         option USE_FAILOVER_IMAGE=0
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x18000
-	option LINUXBIOS_EXTRA_VERSION=".0-fallback"
+	option COREBOOT_EXTRA_VERSION=".0-fallback"
 	payload __PAYLOAD__
 end
 
@@ -30,7 +30,7 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION=".0-failover"
+        option COREBOOT_EXTRA_VERSION=".0-failover"
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/supermicro/h8dmr/Config.lb b/targets/supermicro/h8dmr/Config.lb
index 9a11a314e8..39d6d9e378 100644
--- a/targets/supermicro/h8dmr/Config.lb
+++ b/targets/supermicro/h8dmr/Config.lb
@@ -38,7 +38,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -66,7 +66,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -96,8 +96,8 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/supermicro/h8dmr/Config.lb.kernel b/targets/supermicro/h8dmr/Config.lb.kernel
index e678ab3b1f..8e8c5a4f9a 100644
--- a/targets/supermicro/h8dmr/Config.lb.kernel
+++ b/targets/supermicro/h8dmr/Config.lb.kernel
@@ -35,7 +35,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x15800
 #	option ROM_IMAGE_SIZE=0x13800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -67,9 +67,9 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./linuxbios.rom ROM_SIZE "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
diff --git a/targets/technologic/ts5300/Config-abuild.lb b/targets/technologic/ts5300/Config-abuild.lb
index bfa728de2e..cc66856ed1 100644
--- a/targets/technologic/ts5300/Config-abuild.lb
+++ b/targets/technologic/ts5300/Config-abuild.lb
@@ -14,8 +14,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 #	option ROM_IMAGE_SIZE=32 * 1024 # 0x8000
 	option ROM_IMAGE_SIZE=128 * 1024 # 0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/technologic/ts5300/Config.lb b/targets/technologic/ts5300/Config.lb
index a89b4f807c..286bfdbb85 100644
--- a/targets/technologic/ts5300/Config.lb
+++ b/targets/technologic/ts5300/Config.lb
@@ -11,7 +11,7 @@ option CONFIG_COMPRESS=1
 #romimage "normal"
 #	option USE_FALLBACK_IMAGE=0
 #	option ROM_IMAGE_SIZE=0x10000
-#	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+#	option COREBOOT_EXTRA_VERSION=".0-Normal"
 #	payload /etc/hosts
 #end
 
@@ -24,8 +24,8 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=48 * 1024 # 0x8000
 #	option ROM_IMAGE_SIZE=64 * 1024 # 0x10000
 #	option ROM_IMAGE_SIZE=512 * 1024 # 0x10000
-#	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
-	option LINUXBIOS_EXTRA_VERSION=".0"
+#	option COREBOOT_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0"
 	payload /home/stepan/filo-ts5300.elf
 end
 
diff --git a/targets/totalimpact/briq/Config.lb b/targets/totalimpact/briq/Config.lb
index 08890634a4..92288234fe 100644
--- a/targets/totalimpact/briq/Config.lb
+++ b/targets/totalimpact/briq/Config.lb
@@ -42,11 +42,11 @@ romimage "normal"
 	## Exception vectors (other than reset vector)
 	option _EXCEPTION_VECTORS=_RESET+0x100
 
-	## Start of linuxBIOS in the boot rom
+	## Start of coreboot in the boot rom
 	## = _RESET + exeception vector table size
 	option _ROMSTART=_RESET+0x3100
 
-	## LinuxBIOS C code runs at this location in RAM
+	## Coreboot C code runs at this location in RAM
 	option _RAMBASE=0x00100000
 	option _RAMSTART=0x00100000
 
@@ -55,4 +55,4 @@ romimage "normal"
 
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal"
+buildrom ./coreboot.rom ROM_SIZE "normal"
diff --git a/targets/tyan/s1846/Config.lb b/targets/tyan/s1846/Config.lb
index 0153f6b433..dcc48ef1bf 100644
--- a/targets/tyan/s1846/Config.lb
+++ b/targets/tyan/s1846/Config.lb
@@ -38,14 +38,14 @@ option CONFIG_PCI_ROM_RUN = 1
 
 romimage "normal"
 	option USE_FALLBACK_IMAGE = 0
-	option LINUXBIOS_EXTRA_VERSION = ".0Normal"
+	option COREBOOT_EXTRA_VERSION = ".0Normal"
 	payload /tmp/filo.elf
 end
 
 romimage "fallback"
 	option USE_FALLBACK_IMAGE = 1
-	option LINUXBIOS_EXTRA_VERSION = ".0Fallback"
+	option COREBOOT_EXTRA_VERSION = ".0Fallback"
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2735/Config.lb b/targets/tyan/s2735/Config.lb
index ed1b151261..cd2f774cee 100644
--- a/targets/tyan/s2735/Config.lb
+++ b/targets/tyan/s2735/Config.lb
@@ -16,7 +16,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=0x11800
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -31,7 +31,7 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
         option ROM_IMAGE_SIZE=0x11800
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -42,4 +42,4 @@ romimage "fallback"
         payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2735/ns2735 b/targets/tyan/s2735/ns2735
index 865d45aedf..09a1565561 100644
--- a/targets/tyan/s2735/ns2735
+++ b/targets/tyan/s2735/ns2735
@@ -2,7 +2,7 @@
 TYANMB=s2735
 cd "$TYANMB"
 make
-#cat ../fwx.rom ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cat ../fwx.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+#cat ../fwx.rom ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cat ../fwx.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s2850/Config.lb b/targets/tyan/s2850/Config.lb
index 9cd107e4ac..66b873c5e8 100644
--- a/targets/tyan/s2850/Config.lb
+++ b/targets/tyan/s2850/Config.lb
@@ -20,7 +20,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x13c00
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -43,7 +43,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x13c00
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -58,4 +58,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2850/ns2850 b/targets/tyan/s2850/ns2850
index 0094229935..dd0863042c 100644
--- a/targets/tyan/s2850/ns2850
+++ b/targets/tyan/s2850/ns2850
@@ -2,6 +2,6 @@
 TYANMB=s2850
 cd "$TYANMB"
 make
-cat ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+cat ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s2875/Config.lb b/targets/tyan/s2875/Config.lb
index 6647a82f53..b4388d1a1a 100644
--- a/targets/tyan/s2875/Config.lb
+++ b/targets/tyan/s2875/Config.lb
@@ -20,7 +20,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x17800
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -42,7 +42,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x17800
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -56,4 +56,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2875/ns2875 b/targets/tyan/s2875/ns2875
index 3d694ba314..98287d0546 100644
--- a/targets/tyan/s2875/ns2875
+++ b/targets/tyan/s2875/ns2875
@@ -2,5 +2,5 @@
 TYANMB=s2875
 cd "$TYANMB"
 make
-cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s2880/Config.lb b/targets/tyan/s2880/Config.lb
index 889e8e2836..f1e2960ccd 100644
--- a/targets/tyan/s2880/Config.lb
+++ b/targets/tyan/s2880/Config.lb
@@ -20,7 +20,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -42,7 +42,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -56,4 +56,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2880/ns2880 b/targets/tyan/s2880/ns2880
index 9233e7c749..509e77f062 100644
--- a/targets/tyan/s2880/ns2880
+++ b/targets/tyan/s2880/ns2880
@@ -2,7 +2,7 @@
 TYANMB=s2880
 cd "$TYANMB"
 make
-#cat ../fwx.rom ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cat ../fwx.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+#cat ../fwx.rom ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cat ../fwx.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s2881/Config.lb b/targets/tyan/s2881/Config.lb
index b02b9d88d8..d16a0ee867 100644
--- a/targets/tyan/s2881/Config.lb
+++ b/targets/tyan/s2881/Config.lb
@@ -19,7 +19,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x16000
 	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -40,7 +40,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x16000
 	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -54,4 +54,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2881/ns2881 b/targets/tyan/s2881/ns2881
index 62286936d0..c3ebf402d7 100644
--- a/targets/tyan/s2881/ns2881
+++ b/targets/tyan/s2881/ns2881
@@ -2,7 +2,7 @@
 TYANMB=s2881
 cd "$TYANMB"
 make
-#cat ../fwx.rom ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cat ../fwx.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+#cat ../fwx.rom ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cat ../fwx.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s2882/Config.lb b/targets/tyan/s2882/Config.lb
index a1321978b3..2e044c310c 100644
--- a/targets/tyan/s2882/Config.lb
+++ b/targets/tyan/s2882/Config.lb
@@ -18,7 +18,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x16000
 	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -36,7 +36,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x16000
 	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -48,4 +48,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2882/ns2882 b/targets/tyan/s2882/ns2882
index 886da76b51..706fade1b8 100644
--- a/targets/tyan/s2882/ns2882
+++ b/targets/tyan/s2882/ns2882
@@ -2,7 +2,7 @@
 TYANMB=s2882
 cd "$TYANMB"
 make
-#cat ../fwx.rom ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cat ../fwx.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+#cat ../fwx.rom ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cat ../fwx.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s2885/Config.lb b/targets/tyan/s2885/Config.lb
index 254b961946..8f29db17ac 100644
--- a/targets/tyan/s2885/Config.lb
+++ b/targets/tyan/s2885/Config.lb
@@ -19,7 +19,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x16200
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -43,7 +43,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x16200
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -60,4 +60,4 @@ romimage "fallback"
 #	payload ../../../payloads/tg3--eepro100--e1000--filo_hda2_com2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2885/ns2885 b/targets/tyan/s2885/ns2885
index 58f6aaf2e0..056da1d6ca 100644
--- a/targets/tyan/s2885/ns2885
+++ b/targets/tyan/s2885/ns2885
@@ -2,5 +2,5 @@
 TYANMB=s2885
 cd "$TYANMB"
 make
-cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s2891/Config.lb b/targets/tyan/s2891/Config.lb
index c12db5e07e..a42a21ffc6 100644
--- a/targets/tyan/s2891/Config.lb
+++ b/targets/tyan/s2891/Config.lb
@@ -21,7 +21,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x16000
 	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -43,7 +43,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x16000
 	option ROM_IMAGE_SIZE=0x20000
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -58,4 +58,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2891/Config.lb.com2 b/targets/tyan/s2891/Config.lb.com2
index aabdf5938a..eee6b0af56 100644
--- a/targets/tyan/s2891/Config.lb.com2
+++ b/targets/tyan/s2891/Config.lb.com2
@@ -18,7 +18,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x13000
 	option ROM_IMAGE_SIZE=0x15800
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -39,7 +39,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x13000
 	option ROM_IMAGE_SIZE=0x15800
         option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -54,4 +54,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2892/Config.lb b/targets/tyan/s2892/Config.lb
index 3b4145873c..dff4bfefad 100644
--- a/targets/tyan/s2892/Config.lb
+++ b/targets/tyan/s2892/Config.lb
@@ -22,7 +22,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -44,7 +44,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -58,4 +58,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2895/Config.lb b/targets/tyan/s2895/Config.lb
index 73ca4759ea..f65b253d72 100644
--- a/targets/tyan/s2895/Config.lb
+++ b/targets/tyan/s2895/Config.lb
@@ -23,7 +23,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -53,7 +53,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x17800
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -76,9 +76,9 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
diff --git a/targets/tyan/s2912/Config-abuild.lb b/targets/tyan/s2912/Config-abuild.lb
index a7ca752c4c..fc53090fd2 100644
--- a/targets/tyan/s2912/Config-abuild.lb
+++ b/targets/tyan/s2912/Config-abuild.lb
@@ -27,7 +27,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
@@ -35,8 +35,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s2912/Config.lb b/targets/tyan/s2912/Config.lb
index c99dd33f57..28deabcf6c 100644
--- a/targets/tyan/s2912/Config.lb
+++ b/targets/tyan/s2912/Config.lb
@@ -41,7 +41,7 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -69,7 +69,7 @@ romimage "fallback"
 	option ROM_IMAGE_SIZE=0x20000
 #	option ROM_IMAGE_SIZE=0x15800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -99,8 +99,8 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" "failover"
diff --git a/targets/tyan/s2912/Config.lb.kernel b/targets/tyan/s2912/Config.lb.kernel
index 4917eb90a2..3ca4f324d7 100644
--- a/targets/tyan/s2912/Config.lb.kernel
+++ b/targets/tyan/s2912/Config.lb.kernel
@@ -37,7 +37,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x15800
 #	option ROM_IMAGE_SIZE=0x13800
 	option XIP_ROM_SIZE=0x40000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -69,9 +69,9 @@ romimage "failover"
         option USE_FALLBACK_IMAGE=0
         option ROM_IMAGE_SIZE=FAILOVER_SIZE
         option XIP_ROM_SIZE=FAILOVER_SIZE
-        option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
+        option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Failover"
 end
 
 
-buildrom ./linuxbios.rom ROM_SIZE "fallback" "failover"
-#buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback" 
+buildrom ./coreboot.rom ROM_SIZE "fallback" "failover"
+#buildrom ./coreboot.rom ROM_SIZE "normal" "fallback" 
diff --git a/targets/tyan/s4880/Config.lb b/targets/tyan/s4880/Config.lb
index 42a795cee8..abb9912713 100644
--- a/targets/tyan/s4880/Config.lb
+++ b/targets/tyan/s4880/Config.lb
@@ -18,7 +18,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x19c00
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -37,7 +37,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x19c00
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -50,4 +50,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4880/ns4880 b/targets/tyan/s4880/ns4880
index e54dc27373..c15330b985 100644
--- a/targets/tyan/s4880/ns4880
+++ b/targets/tyan/s4880/ns4880
@@ -2,7 +2,7 @@
 TYANMB=s4880
 cd "$TYANMB"
 make
-#cat ../fwx.rom ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cat ../fwx.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+#cat ../fwx.rom ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cat ../fwx.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/tyan/s4882/Config.lb b/targets/tyan/s4882/Config.lb
index e86d26ea7e..bcf903db9b 100644
--- a/targets/tyan/s4882/Config.lb
+++ b/targets/tyan/s4882/Config.lb
@@ -20,7 +20,7 @@ romimage "normal"
 #	option ROM_IMAGE_SIZE=0x16200
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Normal"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -43,7 +43,7 @@ romimage "fallback"
 #	option ROM_IMAGE_SIZE=0x16200
 	option ROM_IMAGE_SIZE=0x20000
 	option XIP_ROM_SIZE=0x20000
-	option LINUXBIOS_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
+	option COREBOOT_EXTRA_VERSION="$(shell cat ../../VERSION)_Fallback"
 #       payload ../../../payloads/tg3--ide_disk.zelf
 #        payload ../../../payloads/filo.elf
 #        payload ../../../payloads/filo_mem.elf
@@ -58,4 +58,4 @@ romimage "fallback"
 #        payload ../../../payloads/tg3--eepro100--e1000--filo_hda2.zelf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/tyan/s4882/ns4882 b/targets/tyan/s4882/ns4882
index 97e3850385..0092005323 100644
--- a/targets/tyan/s4882/ns4882
+++ b/targets/tyan/s4882/ns4882
@@ -2,7 +2,7 @@
 TYANMB=s4882
 cd "$TYANMB"
 make
-#cat ../fwx.rom ../atix.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cat ../fwx.rom ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-#cat ./normal/linuxbios.rom ./fallback/linuxbios.rom > $TYANMB"_linuxbios.rom"
-cp -f $TYANMB"_linuxbios.rom" /home/yhlu/
+#cat ../fwx.rom ../atix.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cat ../fwx.rom ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+#cat ./normal/coreboot.rom ./fallback/coreboot.rom > $TYANMB"_coreboot.rom"
+cp -f $TYANMB"_coreboot.rom" /home/yhlu/
diff --git a/targets/via/epia-m/Config-abuild.lb b/targets/via/epia-m/Config-abuild.lb
index c74fbfa083..7df740905c 100644
--- a/targets/via/epia-m/Config-abuild.lb
+++ b/targets/via/epia-m/Config-abuild.lb
@@ -17,11 +17,11 @@ option HAVE_FALLBACK_BOOT=1
 
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=131072
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 #
@@ -30,15 +30,15 @@ option _RAMBASE=0x00004000
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload __PAYLOAD__
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload __PAYLOAD__
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia-m/Config.512kflash.lb b/targets/via/epia-m/Config.512kflash.lb
index 518df0c2dd..88d13821ff 100644
--- a/targets/via/epia-m/Config.512kflash.lb
+++ b/targets/via/epia-m/Config.512kflash.lb
@@ -18,17 +18,17 @@ option HAVE_FALLBACK_BOOT=1
 
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=131072
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 #
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 
 #
@@ -37,7 +37,7 @@ option _RAMBASE=0x00004000
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 	payload ../../../../../lnxieepro100.ebi
@@ -46,10 +46,10 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 	payload ../../../../../lnxieepro100.ebi
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia-m/Config.etherboot.lb b/targets/via/epia-m/Config.etherboot.lb
index 4a61fe6138..6e59424be8 100644
--- a/targets/via/epia-m/Config.etherboot.lb
+++ b/targets/via/epia-m/Config.etherboot.lb
@@ -17,17 +17,17 @@ option HAVE_FALLBACK_BOOT=1
 
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=131072
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 #
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 
 #
@@ -36,7 +36,7 @@ option _RAMBASE=0x00004000
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 	payload ../../../../../lnxieepro100.ebi
@@ -45,10 +45,10 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 	payload ../../../../../lnxieepro100.ebi
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia-m/Config.filo.lb b/targets/via/epia-m/Config.filo.lb
index a00269c4fb..bb5bc62a0e 100644
--- a/targets/via/epia-m/Config.filo.lb
+++ b/targets/via/epia-m/Config.filo.lb
@@ -17,17 +17,17 @@ option HAVE_FALLBACK_BOOT=1
 
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=131072
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 #
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 
 #
@@ -36,7 +36,7 @@ option _RAMBASE=0x00004000
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -46,11 +46,11 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
 	payload ../../../../../../filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia-m/Config.lb b/targets/via/epia-m/Config.lb
index f086973295..19f26d26cb 100644
--- a/targets/via/epia-m/Config.lb
+++ b/targets/via/epia-m/Config.lb
@@ -19,11 +19,11 @@ option CONFIG_COMPRESSED_PAYLOAD_NRV2B=0
 
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=131072
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 #
@@ -33,7 +33,7 @@ romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 #option ROM_IMAGE_SIZE=128*1024
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload $(HOME)/svn/payload.elf
 end
 
@@ -41,8 +41,8 @@ romimage "fallback"
 	option USE_FALLBACK_IMAGE=1
 	#option ROM_IMAGE_SIZE=128*1024
 	option ROM_IMAGE_SIZE=60*1024
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload $(HOME)/svn/payload.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia-m/Config.vga.filo b/targets/via/epia-m/Config.vga.filo
index 6af2786c71..c1f88b0bd9 100644
--- a/targets/via/epia-m/Config.vga.filo
+++ b/targets/via/epia-m/Config.vga.filo
@@ -16,16 +16,16 @@ option HAVE_FALLBACK_BOOT=1
 
 ###
 ### Compute the location and size of where this firmware image
-### (linuxBIOS plus bootloader) will live in the boot rom chip.
+### (coreboot plus bootloader) will live in the boot rom chip.
 ###
 option FALLBACK_SIZE=0x18000
 
-## LinuxBIOS C code runs at this location in RAM
+## Coreboot C code runs at this location in RAM
 option _RAMBASE=0x00004000
 
 ###
 ### Compute the start location and size size of
-### The linuxBIOS bootloader.
+### The coreboot bootloader.
 ###
 
 #
@@ -36,15 +36,15 @@ romimage "normal"
 	option ROM_IMAGE_SIZE=0xc000
 	option ROM_SECTION_OFFSET=0x10000
 	option ROM_SECTION_SIZE=0x18000
-	option LINUXBIOS_EXTRA_VERSION=".0-Normal"
+	option COREBOOT_EXTRA_VERSION=".0-Normal"
 	payload $(HOME)/svn/filo.elf
 end
 
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0xc000
-	option LINUXBIOS_EXTRA_VERSION=".0-Fallback"
+	option COREBOOT_EXTRA_VERSION=".0-Fallback"
 	payload $(HOME)/svn/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia/Config.512kflash.lb b/targets/via/epia/Config.512kflash.lb
index 3df3684024..ff2e4da303 100644
--- a/targets/via/epia/Config.512kflash.lb
+++ b/targets/via/epia/Config.512kflash.lb
@@ -11,7 +11,7 @@ option ROM_SIZE=512*1024
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 	payload ../../../../../lnxieepro100.ebi
@@ -20,10 +20,10 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 	payload ../../../../../lnxieepro100.ebi
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia/Config.512kflash.linuxtiny.lb b/targets/via/epia/Config.512kflash.linuxtiny.lb
index c034e66182..c5480ed08c 100644
--- a/targets/via/epia/Config.512kflash.linuxtiny.lb
+++ b/targets/via/epia/Config.512kflash.linuxtiny.lb
@@ -12,10 +12,10 @@ option DEFAULT_CONSOLE_LOGLEVEL=10
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=64*1024
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 	payload /tmp/linux.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE  "fallback"
+buildrom ./coreboot.rom ROM_SIZE  "fallback"
diff --git a/targets/via/epia/Config.filo.lb b/targets/via/epia/Config.filo.lb
index dbce0323d3..0657cdb7e6 100644
--- a/targets/via/epia/Config.filo.lb
+++ b/targets/via/epia/Config.filo.lb
@@ -9,7 +9,7 @@ mainboard via/epia
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -19,11 +19,11 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia/Config.ituner.filo.lb b/targets/via/epia/Config.ituner.filo.lb
index 07110a5960..799dae3965 100644
--- a/targets/via/epia/Config.ituner.filo.lb
+++ b/targets/via/epia/Config.ituner.filo.lb
@@ -11,7 +11,7 @@ option DEFAULT_CONSOLE_LOGLEVEL=9
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -21,11 +21,11 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
 	payload /tmp/filo.elf
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"
diff --git a/targets/via/epia/Config.lb b/targets/via/epia/Config.lb
index 39f1a6b377..f93088da90 100644
--- a/targets/via/epia/Config.lb
+++ b/targets/via/epia/Config.lb
@@ -15,7 +15,7 @@ option DEFAULT_CONSOLE_LOGLEVEL=9
 romimage "normal"
 	option USE_FALLBACK_IMAGE=0
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Normal"
+	option COREBOOT_EXTRA_VERSION=".0Normal"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
@@ -25,11 +25,11 @@ end
 romimage "fallback" 
 	option USE_FALLBACK_IMAGE=1
 	option ROM_IMAGE_SIZE=0x10000
-	option LINUXBIOS_EXTRA_VERSION=".0Fallback"
+	option COREBOOT_EXTRA_VERSION=".0Fallback"
 #	payload /usr/share/etherboot/5.1.9pre2-lnxi-lb/tg3--ide_disk.zelf
 #	payload ../../../../tg3--ide_disk.zelf	
 #	payload ../../../../../lnxieepro100.ebi
 	payload /etc/hosts
 end
 
-buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"
+buildrom ./coreboot.rom ROM_SIZE "normal" "fallback"