27 files changed, 181 insertions, 179 deletions
diff --git a/util/lxbios/ChangeLog b/util/lxbios/ChangeLog
index b78ddce1b1..57d879edb2 100644
--- a/util/lxbios/ChangeLog
+++ b/util/lxbios/ChangeLog
@@ -54,7 +54,7 @@ Wed Nov 30 16:30:00 PST 2005  David S. Peterson (dsp@llnl.gov)
 
 	* Merge patch from Stefan Reinauer <stepan@openbios.org> that makes
 	  lxbios recognize the LB_TAG_OPTION_CHECKSUM entry placed in the
-	  LinuxBIOS table by newer versions of LinuxBIOS.
+	  coreboot table by newer versions of LinuxBIOS.
 
 	* Tweak formatting of code to facilitate merging future patches.
 
@@ -121,11 +121,11 @@ Fri Nov  8 17:00:00 PST 2002  David S. Peterson (dsp@llnl.gov)
 
 	Version 1.1.0.
 
-	* Added -l option for displaying entries from LinuxBIOS table.
+	* Added -l option for displaying entries from coreboot table.
 
-	* Added -d option for low-level dump of LinuxBIOS table.
+	* Added -d option for low-level dump of coreboot table.
 
-	* Improved code that searches for LinuxBIOS table.
+	* Improved code that searches for coreboot table.
 
 Wed Nov  6 09:30:00 PST 2002  David S. Peterson (dsp@llnl.gov)
 
diff --git a/util/lxbios/DISCLAIMER b/util/lxbios/DISCLAIMER
index 4dd5bdc28f..ef21b97664 100644
--- a/util/lxbios/DISCLAIMER
+++ b/util/lxbios/DISCLAIMER
@@ -8,8 +8,8 @@ Written by David S. Peterson <dsp@llnl.gov>.
 UCRL-CODE-2003-012
 All rights reserved.
 
-This file is part of lxbios, a utility for reading/writing LinuxBIOS
-parameters and displaying information from the LinuxBIOS table.
+This file is part of lxbios, a utility for reading/writing coreboot
+parameters and displaying information from the coreboot table.
 For details, see <http://www.llnl.gov/linux/lxbios/>.
 
 This program is free software; you can redistribute it and/or modify it
diff --git a/util/lxbios/README b/util/lxbios/README
index 71c05006e4..c899549ccb 100644
--- a/util/lxbios/README
+++ b/util/lxbios/README
@@ -2,17 +2,17 @@ $Id: README,v 1.3 2006/01/24 00:25:39 dsp_llnl Exp $
 
 Summary of Operation
 --------------------
-lxbios is a utility for reading/writing LinuxBIOS parameters and
-displaying information from the LinuxBIOS table.  It is intended for x86-based
-systems (both 32-bit and 64-bit) that use LinuxBIOS.
+lxbios is a utility for reading/writing coreboot parameters and
+displaying information from the coreboot table.  It is intended for x86-based
+systems (both 32-bit and 64-bit) that use coreboot.
 
-The LinuxBIOS table resides in low physical memory, and may be accessed
-through the /dev/mem interface.  It is created at boot time by LinuxBIOS, and
+The coreboot table resides in low physical memory, and may be accessed
+through the /dev/mem interface.  It is created at boot time by coreboot, and
 contains various system information such as the type of mainboard in use.  It
-specifies locations in the CMOS (nonvolatile RAM) where the LinuxBIOS
+specifies locations in the CMOS (nonvolatile RAM) where the coreboot
 parameters are stored.
 
-For information about LinuxBIOS, see http://www.linuxbios.org/.
+For information about coreboot, see http://www.coreboot.org/.
 
 Ideas for Future Improvements
 -----------------------------
diff --git a/util/lxbios/cmos_lowlevel.c b/util/lxbios/cmos_lowlevel.c
index a4c5687e7c..c8b7742cd4 100644
--- a/util/lxbios/cmos_lowlevel.c
+++ b/util/lxbios/cmos_lowlevel.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/cmos_lowlevel.h b/util/lxbios/cmos_lowlevel.h
index ccc28dc589..99652444bc 100644
--- a/util/lxbios/cmos_lowlevel.h
+++ b/util/lxbios/cmos_lowlevel.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/cmos_ops.c b/util/lxbios/cmos_ops.c
index 02b7049b3c..4bb416272d 100644
--- a/util/lxbios/cmos_ops.c
+++ b/util/lxbios/cmos_ops.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
@@ -154,7 +154,7 @@ int prepare_cmos_write (const cmos_entry_t *e, const char value_str[],
 /****************************************************************************
  * cmos_checksum_read
  *
- * Read the checksum for the LinuxBIOS parameters stored in CMOS and return
+ * Read the checksum for the coreboot parameters stored in CMOS and return
  * this value.
  ****************************************************************************/
 uint16_t cmos_checksum_read (void)
@@ -169,7 +169,7 @@ uint16_t cmos_checksum_read (void)
 /****************************************************************************
  * cmos_checksum_write
  *
- * Set the checksum for the LinuxBIOS parameters stored in CMOS to
+ * Set the checksum for the coreboot parameters stored in CMOS to
  * 'checksum'.
  ****************************************************************************/
 void cmos_checksum_write (uint16_t checksum)
@@ -185,7 +185,7 @@ void cmos_checksum_write (uint16_t checksum)
 /****************************************************************************
  * cmos_checksum_compute
  *
- * Compute a checksum for the LinuxBIOS parameter values currently stored in
+ * Compute a checksum for the coreboot parameter values currently stored in
  * CMOS and return this checksum.
  ****************************************************************************/
 uint16_t cmos_checksum_compute (void)
@@ -202,7 +202,7 @@ uint16_t cmos_checksum_compute (void)
 /****************************************************************************
  * cmos_checksum_verify
  *
- * Verify that the LinuxBIOS CMOS checksum is valid.  If checksum is not
+ * Verify that the coreboot CMOS checksum is valid.  If checksum is not
  * valid then print warning message and exit.
  ****************************************************************************/
 void cmos_checksum_verify (void)
@@ -214,7 +214,7 @@ void cmos_checksum_verify (void)
    set_iopl(0);
 
    if (computed != actual)
-    { fprintf(stderr, "%s: Warning: LinuxBIOS CMOS checksum is bad.\n",
+    { fprintf(stderr, "%s: Warning: Coreboot CMOS checksum is bad.\n",
               prog_name);
       exit(1);
     }
diff --git a/util/lxbios/cmos_ops.h b/util/lxbios/cmos_ops.h
index b9ad8fae26..e8447c56ab 100644
--- a/util/lxbios/cmos_ops.h
+++ b/util/lxbios/cmos_ops.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/common.c b/util/lxbios/common.c
index 4ef87b44a8..d0aa94c9b3 100644
--- a/util/lxbios/common.c
+++ b/util/lxbios/common.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
@@ -74,8 +74,8 @@ void out_of_memory (void)
 void usage (FILE *outfile)
  { fprintf(outfile,
            "Usage: %s [-y LAYOUT_FILE | -t] PARAMETER ...\n\n"
-           "       Read/write LinuxBIOS parameters or show info from "
-           "LinuxBIOS table.\n\n"
+           "       Read/write coreboot parameters or show info from "
+           "coreboot table.\n\n"
            "       -y LAYOUT_FILE: Use CMOS layout specified by "
            "LAYOUT_FILE.\n"
            "       -t:             Use CMOS layout specified by CMOS option "
@@ -92,9 +92,9 @@ void usage (FILE *outfile)
            "standard input.\n"
            "       -c [VALUE]:     Show CMOS checksum or set checksum to "
            "VALUE.\n"
-           "       -l [ARG]:       Show LinuxBIOS table info for ARG, or "
+           "       -l [ARG]:       Show coreboot table info for ARG, or "
            "all ARG choices.\n"
-           "       -d:             Show low-level dump of LinuxBIOS table.\n"
+           "       -d:             Show low-level dump of coreboot table.\n"
            "       -Y:             Show CMOS layout info.\n"
            "       -b OUTPUT_FILE: Dump CMOS memory contents to file.\n"
            "       -B INPUT_FILE:  Write file contents to CMOS memory.\n"
diff --git a/util/lxbios/common.h b/util/lxbios/common.h
index b548c5550d..c0360f4e20 100644
--- a/util/lxbios/common.h
+++ b/util/lxbios/common.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/compute_ip_checksum.c b/util/lxbios/compute_ip_checksum.c
index 6220edb12f..099ace2854 100644
--- a/util/lxbios/compute_ip_checksum.c
+++ b/util/lxbios/compute_ip_checksum.c
@@ -6,9 +6,10 @@
 #include <stdint.h>
 #include "ip_checksum.h"
 
-/* Note: The contents of this file were borrowed from the LinuxBIOS source
- *       code which may be obtained from http://www.linuxbios.org.
- *       Specifically, this code was obtained from LinuxBIOS version 1.0.0.8.
+/* Note: The contents of this file were borrowed from the coreboot source
+ *       code which may be obtained from http://www.coreboot.org.
+ *       Specifically, this code was obtained from coreboot (LinuxBIOS)
+ *       version 1.0.0.8.
  */
 
 unsigned long compute_ip_checksum(void *addr, unsigned long length)
diff --git a/util/lxbios/input_file.c b/util/lxbios/input_file.c
index fd60c063e0..cfe79315e9 100644
--- a/util/lxbios/input_file.c
+++ b/util/lxbios/input_file.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
@@ -56,7 +56,7 @@ static const char blank_or_comment_regex[] =
 const char assignment_regex[] =
    /* optional whitespace */
    "^[[:space:]]*"
-   /* followed by a LinuxBIOS parameter name */
+   /* followed by a coreboot parameter name */
    "([^[:space:]]+)"
    /* followed by optional whitespace */
    "[[:space:]]*"
@@ -120,7 +120,7 @@ cmos_write_t * process_input_file (FILE *f)
       name = &line[match[1].rm_so];
       value = &line[match[2].rm_so];
 
-      /* now look up the LinuxBIOS parameter name */
+      /* now look up the coreboot parameter name */
       if (is_checksum_name(name) || (e = find_cmos_entry(name)) == NULL)
        { fprintf(stderr, "%s: Error on line %d of input file: CMOS parameter "
                  "%s not found.\n", prog_name, line_num, name);
@@ -224,7 +224,7 @@ static unsigned long long try_prepare_cmos_write (const cmos_entry_t *e,
       case CMOS_OP_NEGATIVE_INT:
          fprintf(stderr, "%s: Error on line %d of input file: This program "
                  "does not support assignment of negative numbers to "
-                 "LinuxBIOS parameters.", prog_name, line_num);
+                 "coreboot parameters.", prog_name, line_num);
          break;
 
       case CMOS_OP_INVALID_INT:
@@ -234,7 +234,7 @@ static unsigned long long try_prepare_cmos_write (const cmos_entry_t *e,
 
       case CMOS_OP_RESERVED:
          fprintf(stderr, "%s: Error on line %d of input file: Can not modify "
-                 "reserved LinuxBIOS parameter %s.", prog_name, line_num,
+                 "reserved coreboot parameter %s.", prog_name, line_num,
                  e->name);
          break;
 
@@ -245,32 +245,32 @@ static unsigned long long try_prepare_cmos_write (const cmos_entry_t *e,
          break;
 
       case CMOS_OP_NO_MATCHING_ENUM:
-         fprintf(stderr, "%s: LinuxBIOS parameter %s has no matching enums.",
+         fprintf(stderr, "%s: coreboot parameter %s has no matching enums.",
                  prog_name, e->name);
          break;
 
       case CMOS_AREA_OUT_OF_RANGE:
          fprintf(stderr, "%s: The CMOS area specified by the layout info for "
-                 "LinuxBIOS parameter %s is out of range.", prog_name,
+                 "coreboot parameter %s is out of range.", prog_name,
                  e->name);
          break;
 
       case CMOS_AREA_OVERLAPS_RTC:
          fprintf(stderr, "%s: The CMOS area specified by the layout info for "
-                 "LinuxBIOS parameter %s overlaps the realtime clock area.",
+                 "coreboot parameter %s overlaps the realtime clock area.",
                  prog_name, e->name);
          break;
 
       case CMOS_AREA_TOO_WIDE:
          fprintf(stderr, "%s: The CMOS area specified by the layout info for "
-                 "LinuxBIOS parameter %s is too wide.",
+                 "coreboot parameter %s is too wide.",
                  prog_name, e->name);
          break;
 
       default:
          fprintf(stderr,
                  "%s: Unknown error encountered while attempting to modify "
-                 "LinuxBIOS parameter %s.", prog_name, e->name);
+                 "coreboot parameter %s.", prog_name, e->name);
          break;
     }
 
diff --git a/util/lxbios/input_file.h b/util/lxbios/input_file.h
index 07a43575b7..f0b6df00b1 100644
--- a/util/lxbios/input_file.h
+++ b/util/lxbios/input_file.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/ip_checksum.h b/util/lxbios/ip_checksum.h
index 39703150fb..5c740570f1 100644
--- a/util/lxbios/ip_checksum.h
+++ b/util/lxbios/ip_checksum.h
@@ -6,9 +6,10 @@
 #ifndef IP_CHECKSUM_H
 #define IP_CHECKSUM_H
 
-/* Note: The contents of this file were borrowed from the LinuxBIOS source
- *       code which may be obtained from http://www.linuxbios.org.
- *       Specifically, this code was obtained from LinuxBIOS version 1.0.0.8.
+/* Note: The contents of this file were borrowed from the coreboot source
+ *       code which may be obtained from http://www.coreboot.org.
+ *       Specifically, this code was obtained from coreboot (LinuxBIOS) 
+ *       version 1.0.0.8.
  */
 
 unsigned long compute_ip_checksum(void *addr, unsigned long length);
diff --git a/util/lxbios/layout.c b/util/lxbios/layout.c
index 219dc5d147..c37759cadc 100644
--- a/util/lxbios/layout.c
+++ b/util/lxbios/layout.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
@@ -55,8 +55,8 @@ static const cmos_enum_item_t * find_first_cmos_enum_id (unsigned config_id);
 
 const char checksum_param_name[] = "check_sum";
 
-/* Newer versions of LinuxBIOS store the 3 pieces of information below in the
- * LinuxBIOS table so we don't have to rely on hardcoded values.
+/* Newer versions of coreboot store the 3 pieces of information below in the
+ * coreboot table so we don't have to rely on hardcoded values.
  */
 
 /* This is the offset from the start of CMOS of the first byte that the
@@ -69,7 +69,7 @@ const char checksum_param_name[] = "check_sum";
  */
 #define CMOS_CHECKSUM_END 125
 
-/* This is the offset from the start of CMOS where the LinuxBIOS checksum is
+/* This is the offset from the start of CMOS where the coreboot checksum is
  * stored.
  */
 #define CMOS_CHECKSUM_INDEX 126
diff --git a/util/lxbios/layout.h b/util/lxbios/layout.h
index 8a6ab80b9b..15e009df5f 100644
--- a/util/lxbios/layout.h
+++ b/util/lxbios/layout.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/layout_file.c b/util/lxbios/layout_file.c
index 7027ab93d4..ac63051801 100644
--- a/util/lxbios/layout_file.c
+++ b/util/lxbios/layout_file.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/layout_file.h b/util/lxbios/layout_file.h
index df471a819f..a313fa3ce7 100644
--- a/util/lxbios/layout_file.h
+++ b/util/lxbios/layout_file.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/lbtable.c b/util/lxbios/lbtable.c
index 0fd5e91363..1b479751f3 100644
--- a/util/lxbios/lbtable.c
+++ b/util/lxbios/lbtable.c
@@ -9,8 +9,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
@@ -41,7 +41,7 @@
 
 typedef void (*lbtable_print_fn_t) (const struct lb_record *rec);
 
-/* This structure represents an item in the LinuxBIOS table that may be
+/* This structure represents an item in the coreboot table that may be
  * displayed using the -l option.
  */
 typedef struct
@@ -97,39 +97,39 @@ static const char mainboard_desc[] =
 "    This shows information about your mainboard.\n";
 
 static const char version_desc[] =
-"    This shows LinuxBIOS version information.\n";
+"    This shows coreboot version information.\n";
 
 static const char extra_version_desc[] =
-"    This shows extra LinuxBIOS version information.\n";
+"    This shows extra coreboot version information.\n";
 
 static const char build_desc[] =
-"    This shows LinuxBIOS build information.\n";
+"    This shows coreboot build information.\n";
 
 static const char compile_time_desc[] =
-"    This shows when LinuxBIOS was compiled.\n";
+"    This shows when coreboot was compiled.\n";
 
 static const char compile_by_desc[] =
-"    This shows who compiled LinuxBIOS.\n";
+"    This shows who compiled coreboot.\n";
 
 static const char compile_host_desc[] =
-"    This shows the name of the machine that compiled LinuxBIOS.\n";
+"    This shows the name of the machine that compiled coreboot.\n";
 
 static const char compile_domain_desc[] =
-"    This shows the domain name of the machine that compiled LinuxBIOS.\n";
+"    This shows the domain name of the machine that compiled coreboot.\n";
 
 static const char compiler_desc[] =
-"    This shows the name of the compiler used to build LinuxBIOS.\n";
+"    This shows the name of the compiler used to build coreboot.\n";
 
 static const char linker_desc[] =
-"    This shows the name of the linker used to build LinuxBIOS.\n";
+"    This shows the name of the linker used to build coreboot.\n";
 
 static const char assembler_desc[] =
-"    This shows the name of the assembler used to build LinuxBIOS.\n";
+"    This shows the name of the assembler used to build coreboot.\n";
 
 static const char cmos_opt_table_desc[] =
 "    This does a low-level dump of the CMOS option table.  The table "
 "contains\n"
-"    information about the layout of the values that LinuxBIOS stores in\n"
+"    information about the layout of the values that coreboot stores in\n"
 "    nonvolatile RAM.\n";
 
 static const char option_checksum_desc[] =
@@ -138,23 +138,23 @@ static const char option_checksum_desc[] =
 "    calculated.\n";
 
 static const char generic_nofound_msg[] =
-"%s: Item %s not found in LinuxBIOS table.\n";
+"%s: Item %s not found in coreboot table.\n";
 
 static const char nofound_msg_cmos_opt_table[] =
-"%s: Item %s not found in LinuxBIOS table.  Apparently, the "
-"LinuxBIOS installed on this system was built without specifying "
+"%s: Item %s not found in coreboot table.  Apparently, the "
+"coreboot installed on this system was built without specifying "
 "HAVE_OPTION_TABLE.\n";
 
 static const char nofound_msg_option_checksum[] =
-"%s: Item %s not found in LinuxBIOS table. Apparently, you are "
-"using LinuxBIOS v1.\n";
+"%s: Item %s not found in coreboot table. Apparently, you are "
+"using coreboot v1.\n";
 
-/* This is the number of items from the LinuxBIOS table that may be displayed
+/* This is the number of items from the coreboot table that may be displayed
  * using the -l option.
  */
 #define NUM_LBTABLE_CHOICES 14
 
-/* These represent the various items from the LinuxBIOS table that may be
+/* These represent the various items from the coreboot table that may be
  * displayed using the -l option.
  */
 static const lbtable_choice_t lbtable_choices[NUM_LBTABLE_CHOICES] =
@@ -216,9 +216,9 @@ static const lbtable_choice_t lbtable_choices[NUM_LBTABLE_CHOICES] =
    }
  };
 
-/* The LinuxBIOS table resides in low physical memory, which we access using
+/* The coreboot table resides in low physical memory, which we access using
  * /dev/mem.  These are ranges of physical memory that should be scanned for a
- * LinuxBIOS table.
+ * coreboot table.
  */
 
 #define NUM_MEM_RANGES 2
@@ -231,7 +231,7 @@ static const mem_range_t mem_ranges[NUM_MEM_RANGES] =
 /* This is the number of bytes of physical memory to map, starting at physical
  * address 0.  This value must be large enough to contain all memory ranges
  * specified in mem_ranges above plus the maximum possible size of the
- * LinuxBIOS table (since the start of the table could potentially occur at
+ * coreboot table (since the start of the table could potentially occur at
  * the end of the last memory range).
  */
 static const size_t BYTES_TO_MAP = (1024 * 1024);
@@ -241,10 +241,10 @@ static const size_t BYTES_TO_MAP = (1024 * 1024);
  */
 static const void *low_phys_mem;
 
-/* Pointer to LinuxBIOS table. */
+/* Pointer to coreboot table. */
 static const struct lb_header *lbtable = NULL;
 
-/* The CMOS option table is located within the LinuxBIOS table.  It tells us
+/* The CMOS option table is located within the coreboot table.  It tells us
  * where the CMOS parameters are located in the nonvolatile RAM.
  */
 static const struct cmos_option_table *cmos_table = NULL;
@@ -277,7 +277,7 @@ static const hexdump_format_t format =
 /****************************************************************************
  * get_lbtable
  *
- * Find the LinuxBIOS table and set global variable lbtable to point to it.
+ * Find the coreboot table and set global variable lbtable to point to it.
  ****************************************************************************/
 void get_lbtable (void)
  { int fd, i, bad_header_count, bad_table_count, bad_headers, bad_tables;
@@ -285,7 +285,7 @@ void get_lbtable (void)
    if (lbtable != NULL)
       return;
 
-   /* The LinuxBIOS table is located in low physical memory, which may be
+   /* The coreboot table is located in low physical memory, which may be
     * conveniently accessed by calling mmap() on /dev/mem.
     */
 
@@ -318,7 +318,7 @@ void get_lbtable (void)
     }
 
    fprintf(stderr,
-           "%s: LinuxBIOS table not found.  LinuxBIOS does not appear to\n"
+           "%s: coreboot table not found.  coreboot does not appear to\n"
            "        be installed on this system.  Scanning for the table "
            "produced the\n"
            "        following results:\n\n"
@@ -333,7 +333,7 @@ void get_lbtable (void)
 /****************************************************************************
  * get_layout_from_cmos_table
  *
- * Find the CMOS table which is stored within the LinuxBIOS table and set the
+ * Find the CMOS table which is stored within the coreboot table and set the
  * global variable cmos_table to point to it.
  ****************************************************************************/
 void get_layout_from_cmos_table (void)
@@ -345,8 +345,8 @@ void get_layout_from_cmos_table (void)
 
    if ((cmos_table) == NULL)
     { fprintf(stderr,
-              "%s: CMOS option table not found in LinuxBIOS table.  "
-              "Apparently, the LinuxBIOS installed on this system was "
+              "%s: CMOS option table not found in coreboot table.  "
+              "Apparently, the coreboot installed on this system was "
               "built without specifying HAVE_OPTION_TABLE.\n",
               prog_name);
       exit(1);
@@ -359,7 +359,7 @@ void get_layout_from_cmos_table (void)
 /****************************************************************************
  * dump_lbtable
  *
- * Do a low-level dump of the LinuxBIOS table.
+ * Do a low-level dump of the coreboot table.
  ****************************************************************************/
 void dump_lbtable (void)
  { const char *p, *data;
@@ -367,7 +367,7 @@ void dump_lbtable (void)
    const struct lb_record *lbrec;
 
    p = ((const char *) lbtable) + lbtable->header_bytes;
-   printf("LinuxBIOS table at physical address 0x%lx:\n"
+   printf("Coreboot table at physical address 0x%lx:\n"
           "    signature:       0x%x (ASCII: %c%c%c%c)\n"
           "    header_bytes:    0x%x (decimal: %d)\n"
           "    header_checksum: 0x%x (decimal: %d)\n"
@@ -389,7 +389,7 @@ void dump_lbtable (void)
     }
 
    if (lbtable->table_bytes == 0)
-    { printf("The LinuxBIOS table is empty!!!\n");
+    { printf("The coreboot table is empty!!!\n");
       return;
     }
 
@@ -418,7 +418,7 @@ void dump_lbtable (void)
 /****************************************************************************
  * list_lbtable_choices
  *
- * List names and informational blurbs for items from the LinuxBIOS table
+ * List names and informational blurbs for items from the coreboot table
  * that may be displayed using the -l option.
  ****************************************************************************/
 void list_lbtable_choices (void)
@@ -438,7 +438,7 @@ void list_lbtable_choices (void)
 /****************************************************************************
  * list_lbtable_item
  *
- * Show the LinuxBIOS table item specified by 'item'.
+ * Show the coreboot table item specified by 'item'.
  ****************************************************************************/
 void list_lbtable_item (const char item[])
  { int i;
@@ -450,7 +450,7 @@ void list_lbtable_item (const char item[])
     }
 
    if (i == NUM_LBTABLE_CHOICES)
-    { fprintf(stderr, "%s: Invalid LinuxBIOS table item %s.\n", prog_name,
+    { fprintf(stderr, "%s: Invalid coreboot table item %s.\n", prog_name,
               item);
       exit(1);
     }
@@ -467,7 +467,7 @@ void list_lbtable_item (const char item[])
 /****************************************************************************
  * lbtable_scan
  *
- * Scan the chunk of memory specified by 'start' and 'end' for a LinuxBIOS
+ * Scan the chunk of memory specified by 'start' and 'end' for a coreboot
  * table.  The first 4 bytes of the table are marked by the signature
  * { 'L', 'B', 'I', 'O' }.  'start' and 'end' indicate the addresses of the
  * first and last bytes of the chunk of memory to be scanned.  For instance,
@@ -476,7 +476,7 @@ void list_lbtable_item (const char item[])
  * virtual addresses in the address space of the current process.  They
  * represent a chunk of memory obtained by calling mmap() on /dev/mem.
  *
- * If a LinuxBIOS table is found, return a pointer to it.  Otherwise return
+ * If a coreboot table is found, return a pointer to it.  Otherwise return
  * NULL.  On return, *bad_header_count and *bad_table_count are set as
  * follows:
  *
@@ -609,7 +609,7 @@ static void get_cmos_checksum_info (void)
    checksum = (struct cmos_checksum *) find_lbrec(LB_TAG_OPTION_CHECKSUM);
 
    if (checksum != NULL)
-    { /* We are lucky.  The LinuxBIOS table hints us to the checksum.
+    { /* We are lucky.  The coreboot table hints us to the checksum.
        * We might have to check the type field here though.
        */
       layout.summed_area_start = checksum->range_start;
@@ -789,7 +789,7 @@ static void try_add_cmos_table_entry (cmos_entry_t *cmos_entry)
 /****************************************************************************
  * find_lbrec
  *
- * Find the record in the LinuxBIOS table that matches 'tag'.  Return pointer
+ * Find the record in the coreboot table that matches 'tag'.  Return pointer
  * to record on success or NULL if record not found.
  ****************************************************************************/
 static const struct lb_record * find_lbrec (uint32_t tag)
@@ -814,7 +814,7 @@ static const struct lb_record * find_lbrec (uint32_t tag)
 /****************************************************************************
  * lbrec_tag_to_str
  *
- * Return a pointer to the string representation of the given LinuxBIOS table
+ * Return a pointer to the string representation of the given coreboot table
  * tag.
  ****************************************************************************/
 static const char * lbrec_tag_to_str (uint32_t tag)
@@ -986,7 +986,7 @@ static const struct lb_record * next_cmos_rec (const struct lb_record *last,
 /****************************************************************************
  * memory_print_fn
  *
- * Display function for 'memory' item of LinuxBIOS table.
+ * Display function for 'memory' item of coreboot table.
  ****************************************************************************/
 static void memory_print_fn (const struct lb_record *rec)
  { char start_str[19], end_str[19], size_str[19];
@@ -1046,7 +1046,7 @@ static void memory_print_fn (const struct lb_record *rec)
 /****************************************************************************
  * mainboard_print_fn
  *
- * Display function for 'mainboard' item of LinuxBIOS table.
+ * Display function for 'mainboard' item of coreboot table.
  ****************************************************************************/
 static void mainboard_print_fn (const struct lb_record *rec)
  { const struct lb_mainboard *p;
@@ -1061,7 +1061,7 @@ static void mainboard_print_fn (const struct lb_record *rec)
 /****************************************************************************
  * cmos_opt_table_print_fn
  *
- * Display function for 'cmos_opt_table' item of LinuxBIOS table.
+ * Display function for 'cmos_opt_table' item of coreboot table.
  ****************************************************************************/
 static void cmos_opt_table_print_fn (const struct lb_record *rec)
  {
@@ -1223,7 +1223,7 @@ static void print_unknown_record (const struct lb_record *cmos_item)
 /****************************************************************************
  * option_checksum_print_fn
  *
- * Display function for 'option_checksum' item of LinuxBIOS table.
+ * Display function for 'option_checksum' item of coreboot table.
  ****************************************************************************/
 static void option_checksum_print_fn (const struct lb_record *rec)
  { struct cmos_checksum *p;
@@ -1238,7 +1238,7 @@ static void option_checksum_print_fn (const struct lb_record *rec)
 /****************************************************************************
  * string_print_fn
  *
- * Display function for a generic item of LinuxBIOS table that simply
+ * Display function for a generic item of coreboot table that simply
  * consists of a string.
  ****************************************************************************/
 static void string_print_fn (const struct lb_record *rec)
diff --git a/util/lxbios/lbtable.h b/util/lxbios/lbtable.h
index b069ad2799..e32a690f79 100644
--- a/util/lxbios/lbtable.h
+++ b/util/lxbios/lbtable.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/linuxbios_tables.h b/util/lxbios/linuxbios_tables.h
index 7f0a78ba64..f7271f3b99 100644
--- a/util/lxbios/linuxbios_tables.h
+++ b/util/lxbios/linuxbios_tables.h
@@ -3,17 +3,17 @@
  * $Id: linuxbios_tables.h,v 1.1.1.1 2005/12/02 22:35:19 dsp_llnl Exp $
 \*****************************************************************************/
 
-#ifndef LINUXBIOS_TABLES_H
-#define LINUXBIOS_TABLES_H
+#ifndef COREBOOT_TABLES_H
+#define COREBOOT_TABLES_H
 
 #include <stdint.h>
 
-/* Note: The contents of this file were borrowed from the LinuxBIOS source
- *       code which may be obtained from http://www.linuxbios.org/.
+/* Note: The contents of this file were borrowed from the coreboot source
+ *       code which may be obtained from http://www.coreboot.org/.
  *       Specifically, this code was obtained from LinuxBIOS version 1.1.8.
  */
 
-/* The linuxbios table information is for conveying information
+/* The coreboot table information is for conveying information
  * from the firmware to the loaded OS image.  Primarily this
  * is expected to be information that cannot be discovered by
  * other means, such as quering the hardware directly.
@@ -41,12 +41,12 @@
  * table entries and be backwards compatible, but it is not required.
  */
 
-/* Since LinuxBIOS is usually compiled 32bit, gcc will align 64bit 
- * types to 32bit boundaries. If the LinuxBIOS table is dumped on a 
+/* Since coreboot is usually compiled 32bit, gcc will align 64bit 
+ * types to 32bit boundaries. If the coreboot table is dumped on a 
  * 64bit system, a uint64_t would be aligned to 64bit boundaries, 
  * breaking the table format.
  *
- * lb_uint64 will keep 64bit LinuxBIOS table values aligned to 32bit
+ * lb_uint64 will keep 64bit coreboot table values aligned to 32bit
  * to ensure compatibility. They can be accessed with the two functions
  * below: unpack_lb64() and pack_lb64()
  *
@@ -223,4 +223,4 @@ struct	cmos_checksum {
 
 
 
-#endif /* LINUXBIOS_TABLES_H */
+#endif /* COREBOOT_TABLES_H */
diff --git a/util/lxbios/lxbios.1 b/util/lxbios/lxbios.1
index 89233e7607..fad04e9239 100644
--- a/util/lxbios/lxbios.1
+++ b/util/lxbios/lxbios.1
@@ -8,8 +8,8 @@
 .\"  UCRL-CODE-2003-012
 .\"  All rights reserved.
 .\"
-.\"  This file is part of lxbios, a utility for reading/writing LinuxBIOS
-.\"  parameters and displaying information from the LinuxBIOS table.
+.\"  This file is part of lxbios, a utility for reading/writing coreboot
+.\"  parameters and displaying information from the coreboot table.
 .\"  For details, see <http://www.llnl.gov/linux/lxbios/>.
 .\"
 .\"  Please also read the file DISCLAIMER which is included in this software
@@ -28,9 +28,9 @@
 .\"  with this program; if not, write to the Free Software Foundation, Inc.,
 .\"  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 .\"***************************************************************************/
-.TH LXBIOS 1 "December 2005" Linux
+.TH LXBIOS 1 "January 2008" Linux
 .SH NAME
-lxbios \- read/write LinuxBIOS-related information
+lxbios \- read/write coreboot-related information
 .SH SYNOPSIS
 .B "lxbios [OPTS] [-n] -r NAME"
 .br
@@ -65,22 +65,22 @@ lxbios \- read/write LinuxBIOS-related information
 .B "lxbios [OPTS] -h"
 .SH DESCRIPTION
 .B "lxbios"
-is a utility for reading/writing LinuxBIOS parameters and displaying
-information from the LinuxBIOS table.
+is a utility for reading/writing coreboot parameters and displaying
+information from the coreboot table.
 
-The LinuxBIOS table resides in low physical memory.  It is created at boot
-time by LinuxBIOS, and contains various system information such as the type
+The coreboot table resides in low physical memory.  It is created at boot
+time by coreboot, and contains various system information such as the type
 of mainboard in use.  It specifies locations in the CMOS (nonvolatile RAM)
-where the LinuxBIOS parameters are stored.
+where the coreboot parameters are stored.
 
-This program is intended for x86-based systems that use LinuxBIOS.  For
-information about LinuxBIOS, see
+This program is intended for (x86-based) systems that use coreboot.  For
+information about coreboot, see
 .br
-http://www.linuxbios.org/.
+http://www.coreboot.org/.
 .SH PARAMETERS
 .TP
 .B "[-n] -r NAME"
-Show the value of the LinuxBIOS parameter given by
+Show the value of the coreboot parameter given by
 .B "NAME."
 If
 .B "-n"
@@ -92,16 +92,16 @@ Show all possible values for parameter given by
 .B "NAME."
 .TP
 .B "-a"
-Show the names and values for all LinuxBIOS parameters.
+Show the names and values for all coreboot parameters.
 .TP
 .B "-w NAME=VALUE"
 Assign
 .B "VALUE"
-to LinuxBIOS parameter given by
+to coreboot parameter given by
 .B "NAME."
 .TP
 .B "-p INPUT_FILE"
-Assign values to LinuxBIOS parameters according to the contents of
+Assign values to coreboot parameters according to the contents of
 .B "INPUT_FILE."
 The format of this file is described below.
 .TP
@@ -114,20 +114,20 @@ input.
 .B "-c [VALUE]"
 If
 .B "VALUE"
-is present then set the CMOS checksum for the LinuxBIOS parameters to
+is present then set the CMOS checksum for the coreboot parameters to
 .B "VALUE." 
 Otherwise, show the checksum value.
 .TP
 .B "-l [ARG]"
 If
 .B "ARG"
-is present then show information from the LinuxBIOS table as specified by
+is present then show information from the coreboot table as specified by
 .B "ARG."
 Otherwise show all possible values for
 .B "ARG."
 .TP
 .B "-d"
-Do a low-level dump of the LinuxBIOS table.
+Do a low-level dump of the coreboot table.
 .TP
 .B "-Y"
 Write CMOS layout information to standard output.  If redirected to a file,
@@ -185,16 +185,16 @@ option tells lxbios to obtain CMOS layout information from the contents of
 Likewise, the
 .B "'-t'"
 option tells lxbios to obtain CMOS layout information from the CMOS option
-table (contained within the LinuxBIOS table).  If neither option is
+table (contained within the coreboot table).  If neither option is
 specified, the CMOS option table is used by default.
 .B "LAYOUT_FILE"
 follows the format of the
 .B "cmos.layout"
-files provided by LinuxBIOS.
+files provided by coreboot.
 
-If the LinuxBIOS installed on your system was built without specifying
+If the coreboot installed on your system was built without specifying
 .B "HAVE_OPTION_TABLE,"
-then the LinuxBIOS table will not contain a CMOS option table.  In this case,
+then the coreboot table will not contain a CMOS option table.  In this case,
 the
 .B "'-y LAYOUT_FILE'"
 option must be used.
@@ -226,7 +226,7 @@ assignment is constructed as follows:
 
 Here,
 .B "NAME"
-is the name of a LinuxBIOS parameter and
+is the name of a coreboot parameter and
 .B "VALUE"
 is the value that will be assigned to
 .B "NAME."
diff --git a/util/lxbios/lxbios.c b/util/lxbios/lxbios.c
index bc2cba127b..a89a1ec704 100644
--- a/util/lxbios/lxbios.c
+++ b/util/lxbios/lxbios.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
@@ -136,7 +136,7 @@ static void op_show_usage (void)
  *
  * -l [ARG]
  *
- * If ARG is present, show LinuxBIOS table information specified by ARG.
+ * If ARG is present, show coreboot table information specified by ARG.
  * Else show all possible values for ARG.
  ****************************************************************************/
 static void op_lbtable_show_info (void)
@@ -153,7 +153,7 @@ static void op_lbtable_show_info (void)
  *
  * -d
  *
- * Do low-level dump of LinuxBIOS table.
+ * Do low-level dump of coreboot table.
  ****************************************************************************/
 static void op_lbtable_dump (void)
  { get_lbtable();
@@ -268,7 +268,7 @@ static void op_cmos_set_params_file (void)
  *
  * -c [VALUE]
  *
- * If VALUE is present, set LinuxBIOS CMOS checksum to VALUE.  Else show
+ * If VALUE is present, set coreboot CMOS checksum to VALUE.  Else show
  * checksum value.
  ****************************************************************************/
 static void op_cmos_checksum (void)
@@ -516,7 +516,7 @@ static void set_one_param (const char name[], const char value[])
       case CMOS_OP_NEGATIVE_INT:
          fprintf(stderr,
                  "%s: This program does not support assignment of negative "
-                 "numbers to LinuxBIOS parameters.", prog_name);
+                 "numbers to coreboot parameters.", prog_name);
          goto fail;
 
       case CMOS_OP_INVALID_INT:
@@ -525,7 +525,7 @@ static void set_one_param (const char name[], const char value[])
 
       case CMOS_OP_RESERVED:
          fprintf(stderr,
-                 "%s: Can not modify reserved LinuxBIOS parameter %s.",
+                 "%s: Can not modify reserved coreboot parameter %s.",
                  prog_name, name);
          goto fail;
 
@@ -537,34 +537,34 @@ static void set_one_param (const char name[], const char value[])
 
       case CMOS_OP_NO_MATCHING_ENUM:
          fprintf(stderr,
-                 "%s: LinuxBIOS parameter %s has no matching enums.",
+                 "%s: coreboot parameter %s has no matching enums.",
                  prog_name, name);
          goto fail;
 
       case CMOS_AREA_OUT_OF_RANGE:
          fprintf(stderr,
                  "%s: The CMOS area specified by the layout info for "
-                 "LinuxBIOS parameter %s is out of range.", prog_name, name);
+                 "coreboot parameter %s is out of range.", prog_name, name);
          goto fail;
 
       case CMOS_AREA_OVERLAPS_RTC:
          fprintf(stderr,
                  "%s: The CMOS area specified by the layout info for "
-                 "LinuxBIOS parameter %s overlaps the realtime clock area.",
+                 "coreboot parameter %s overlaps the realtime clock area.",
                  prog_name, name);
          goto fail;
 
       case CMOS_AREA_TOO_WIDE:
          fprintf(stderr,
                  "%s: The CMOS area specified by the layout info for "
-                 "LinuxBIOS parameter %s is too wide.",
+                 "coreboot parameter %s is too wide.",
                  prog_name, name);
          goto fail;
 
       default:
          fprintf(stderr,
                  "%s: Unknown error encountered while attempting to modify "
-                 "LinuxBIOS parameter %s.", prog_name, name);
+                 "coreboot parameter %s.", prog_name, name);
          goto fail;
     }
 
@@ -583,7 +583,7 @@ fail:
 /****************************************************************************
  * set_params
  *
- * Set LinuxBIOS parameters according to the contents of file 'f'.
+ * Set coreboot parameters according to the contents of file 'f'.
  ****************************************************************************/
 static void set_params (FILE *f)
  { /* First process the input file.  Then perform writes only if there were
@@ -649,26 +649,26 @@ static int list_cmos_entry (const cmos_entry_t *e, int show_name)
          BUG();
 
       case CMOS_AREA_OUT_OF_RANGE:
-         fprintf(stderr, "%s: Can not read LinuxBIOS parameter %s because "
+         fprintf(stderr, "%s: Can not read coreboot parameter %s because "
                  "layout info specifies out of range CMOS area.\n", prog_name,
                  e->name);
          return 1;
 
       case CMOS_AREA_OVERLAPS_RTC:
-         fprintf(stderr, "%s: Can not read LinuxBIOS parameter %s because "
+         fprintf(stderr, "%s: Can not read coreboot parameter %s because "
                  "layout info specifies CMOS area that overlaps realtime "
                  "clock area.\n", prog_name, e->name);
          return 1;
 
       case CMOS_AREA_TOO_WIDE:
-         fprintf(stderr, "%s: Can not read LinuxBIOS parameter %s because "
+         fprintf(stderr, "%s: Can not read coreboot parameter %s because "
                  "layout info specifies CMOS area that is too wide.\n",
                  prog_name, e->name);
          return 1;
 
       default:
          fprintf(stderr, "%s: Unknown error encountered while attempting to "
-                 "read LinuxBIOS parameter %s\n", prog_name, e->name);
+                 "read coreboot parameter %s\n", prog_name, e->name);
          return 1;
     }
 
diff --git a/util/lxbios/lxbios.spec b/util/lxbios/lxbios.spec
index 90e79ce499..cd3ba7dc61 100644
--- a/util/lxbios/lxbios.spec
+++ b/util/lxbios/lxbios.spec
@@ -6,7 +6,7 @@ Name:    lxbios
 Version: 2.0.1
 Release: 0
 
-Summary: LinuxBIOS utility program
+Summary: coreboot utility program
 Group:   System Environment/Base
 License: GPL
 Provides: lxbios
@@ -16,15 +16,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
 Source0: %{name}-%{version}.tgz
 
 %description
-lxbios is a utility for reading/writing LinuxBIOS parameters and displaying
-information from the LinuxBIOS table.
+lxbios is a utility for reading/writing coreboot parameters and displaying
+information from the coreboot table.
 
-At boot time, LinuxBIOS places a table (known as the LinuxBIOS table) in low
+At boot time, coreboot places a table (known as the coreboot table) in low
 physical memory.  The contents of this table are preserved even after
-LinuxBIOS transfers control to the kernel and the kernel initializes itself.
-The LinuxBIOS table contains various system information such as the type of
+coreboot transfers control to the kernel and the kernel initializes itself.
+The coreboot table contains various system information such as the type of
 mainboard in use.  It also specifies locations in the CMOS (nonvolatile RAM)
-where the LinuxBIOS parameters are stored.
+where the coreboot parameters are stored.
 
 %prep
 %setup -n %{name}-%{version}
diff --git a/util/lxbios/opts.c b/util/lxbios/opts.c
index 367678b5bf..1313e486d3 100644
--- a/util/lxbios/opts.c
+++ b/util/lxbios/opts.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/opts.h b/util/lxbios/opts.h
index 0474e7b368..3579498190 100644
--- a/util/lxbios/opts.h
+++ b/util/lxbios/opts.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/reg_expr.c b/util/lxbios/reg_expr.c
index 93a54b942f..57066dd96f 100644
--- a/util/lxbios/reg_expr.c
+++ b/util/lxbios/reg_expr.c
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software
diff --git a/util/lxbios/reg_expr.h b/util/lxbios/reg_expr.h
index 4a664682af..3b72ffee56 100644
--- a/util/lxbios/reg_expr.h
+++ b/util/lxbios/reg_expr.h
@@ -8,8 +8,8 @@
  *  UCRL-CODE-2003-012
  *  All rights reserved.
  *
- *  This file is part of lxbios, a utility for reading/writing LinuxBIOS
- *  parameters and displaying information from the LinuxBIOS table.
+ *  This file is part of lxbios, a utility for reading/writing coreboot
+ *  parameters and displaying information from the coreboot table.
  *  For details, see <http://www.llnl.gov/linux/lxbios/>.
  *
  *  Please also read the file DISCLAIMER which is included in this software