4 files changed, 4 insertions, 4 deletions
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index 673b394455..ff9072e2b6 100644
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -30,7 +30,7 @@ CFLAGS  = -O2 -g -Wall -W -I.
 CLI_OBJS = cli/nvramtool.o cli/opts.o
 
 OBJS =  cmos_lowlevel.o cmos_ops.o common.o compute_ip_checksum.o \
-	hexdump.o input_file.o layout.o layout_file.o lbtable.o   \
+	hexdump.o input_file.o layout.o accessors/layout-text.o lbtable.o   \
 	reg_expr.o cbfs.o
 
 OBJS += $(CLI_OBJS)
diff --git a/util/nvramtool/layout_file.c b/util/nvramtool/accessors/layout-text.c
index 535554f704..5f7cadea97 100644
--- a/util/nvramtool/layout_file.c
+++ b/util/nvramtool/accessors/layout-text.c
@@ -1,5 +1,5 @@
 /*****************************************************************************\
- * layout_file.c
+ * layout-text.c
  *****************************************************************************
  *  Copyright (C) 2002-2005 The Regents of the University of California.
  *  Produced at the Lawrence Livermore National Laboratory.
@@ -29,7 +29,7 @@
 \*****************************************************************************/
 
 #include "common.h"
-#include "layout_file.h"
+#include "layout-text.h"
 #include "layout.h"
 #include "cmos_lowlevel.h"
 #include "reg_expr.h"
diff --git a/util/nvramtool/layout_file.h b/util/nvramtool/accessors/layout-text.h
index 21997e9a46..21997e9a46 100644
--- a/util/nvramtool/layout_file.h
+++ b/util/nvramtool/accessors/layout-text.h
diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c
index e3e7e8875a..23de093fa0 100644
--- a/util/nvramtool/cli/nvramtool.c
+++ b/util/nvramtool/cli/nvramtool.c
@@ -36,7 +36,7 @@
 #include "opts.h"
 #include "lbtable.h"
 #include "layout.h"
-#include "layout_file.h"
+#include "accessors/layout-text.h"
 #include "input_file.h"
 #include "cmos_ops.h"
 #include "cmos_lowlevel.h"