diff --git a/util/lxbios/COPYING b/util/nvramtool/COPYING
similarity index 100%
rename from util/lxbios/COPYING
rename to util/nvramtool/COPYING
diff --git a/util/lxbios/ChangeLog b/util/nvramtool/ChangeLog
similarity index 100%
rename from util/lxbios/ChangeLog
rename to util/nvramtool/ChangeLog
diff --git a/util/lxbios/DISCLAIMER b/util/nvramtool/DISCLAIMER
similarity index 100%
rename from util/lxbios/DISCLAIMER
rename to util/nvramtool/DISCLAIMER
diff --git a/util/lxbios/Makefile b/util/nvramtool/Makefile
similarity index 100%
rename from util/lxbios/Makefile
rename to util/nvramtool/Makefile
diff --git a/util/lxbios/README b/util/nvramtool/README
similarity index 100%
rename from util/lxbios/README
rename to util/nvramtool/README
diff --git a/util/lxbios/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
similarity index 100%
rename from util/lxbios/cmos_lowlevel.c
rename to util/nvramtool/cmos_lowlevel.c
diff --git a/util/lxbios/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h
similarity index 100%
rename from util/lxbios/cmos_lowlevel.h
rename to util/nvramtool/cmos_lowlevel.h
diff --git a/util/lxbios/cmos_ops.c b/util/nvramtool/cmos_ops.c
similarity index 100%
rename from util/lxbios/cmos_ops.c
rename to util/nvramtool/cmos_ops.c
diff --git a/util/lxbios/cmos_ops.h b/util/nvramtool/cmos_ops.h
similarity index 100%
rename from util/lxbios/cmos_ops.h
rename to util/nvramtool/cmos_ops.h
diff --git a/util/lxbios/common.c b/util/nvramtool/common.c
similarity index 100%
rename from util/lxbios/common.c
rename to util/nvramtool/common.c
diff --git a/util/lxbios/common.h b/util/nvramtool/common.h
similarity index 100%
rename from util/lxbios/common.h
rename to util/nvramtool/common.h
diff --git a/util/lxbios/compute_ip_checksum.c b/util/nvramtool/compute_ip_checksum.c
similarity index 100%
rename from util/lxbios/compute_ip_checksum.c
rename to util/nvramtool/compute_ip_checksum.c
diff --git a/util/lxbios/coreboot_tables.h b/util/nvramtool/coreboot_tables.h
similarity index 100%
rename from util/lxbios/coreboot_tables.h
rename to util/nvramtool/coreboot_tables.h
diff --git a/util/lxbios/hexdump.c b/util/nvramtool/hexdump.c
similarity index 100%
rename from util/lxbios/hexdump.c
rename to util/nvramtool/hexdump.c
diff --git a/util/lxbios/hexdump.h b/util/nvramtool/hexdump.h
similarity index 100%
rename from util/lxbios/hexdump.h
rename to util/nvramtool/hexdump.h
diff --git a/util/lxbios/input_file.c b/util/nvramtool/input_file.c
similarity index 100%
rename from util/lxbios/input_file.c
rename to util/nvramtool/input_file.c
diff --git a/util/lxbios/input_file.h b/util/nvramtool/input_file.h
similarity index 100%
rename from util/lxbios/input_file.h
rename to util/nvramtool/input_file.h
diff --git a/util/lxbios/ip_checksum.h b/util/nvramtool/ip_checksum.h
similarity index 100%
rename from util/lxbios/ip_checksum.h
rename to util/nvramtool/ip_checksum.h
diff --git a/util/lxbios/layout.c b/util/nvramtool/layout.c
similarity index 100%
rename from util/lxbios/layout.c
rename to util/nvramtool/layout.c
diff --git a/util/lxbios/layout.h b/util/nvramtool/layout.h
similarity index 100%
rename from util/lxbios/layout.h
rename to util/nvramtool/layout.h
diff --git a/util/lxbios/layout_file.c b/util/nvramtool/layout_file.c
similarity index 100%
rename from util/lxbios/layout_file.c
rename to util/nvramtool/layout_file.c
diff --git a/util/lxbios/layout_file.h b/util/nvramtool/layout_file.h
similarity index 100%
rename from util/lxbios/layout_file.h
rename to util/nvramtool/layout_file.h
diff --git a/util/lxbios/lbtable.c b/util/nvramtool/lbtable.c
similarity index 100%
rename from util/lxbios/lbtable.c
rename to util/nvramtool/lbtable.c
diff --git a/util/lxbios/lbtable.h b/util/nvramtool/lbtable.h
similarity index 100%
rename from util/lxbios/lbtable.h
rename to util/nvramtool/lbtable.h
diff --git a/util/lxbios/nvramtool.1 b/util/nvramtool/nvramtool.1
similarity index 100%
rename from util/lxbios/nvramtool.1
rename to util/nvramtool/nvramtool.1
diff --git a/util/lxbios/nvramtool.c b/util/nvramtool/nvramtool.c
similarity index 100%
rename from util/lxbios/nvramtool.c
rename to util/nvramtool/nvramtool.c
diff --git a/util/lxbios/nvramtool.spec b/util/nvramtool/nvramtool.spec
similarity index 100%
rename from util/lxbios/nvramtool.spec
rename to util/nvramtool/nvramtool.spec
diff --git a/util/lxbios/opts.c b/util/nvramtool/opts.c
similarity index 100%
rename from util/lxbios/opts.c
rename to util/nvramtool/opts.c
diff --git a/util/lxbios/opts.h b/util/nvramtool/opts.h
similarity index 100%
rename from util/lxbios/opts.h
rename to util/nvramtool/opts.h
diff --git a/util/lxbios/reg_expr.c b/util/nvramtool/reg_expr.c
similarity index 100%
rename from util/lxbios/reg_expr.c
rename to util/nvramtool/reg_expr.c
diff --git a/util/lxbios/reg_expr.h b/util/nvramtool/reg_expr.h
similarity index 100%
rename from util/lxbios/reg_expr.h
rename to util/nvramtool/reg_expr.h