diff --git a/Makefile b/Makefile
index bb460c5..fbae239 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile for flash_rom
+# Makefile for flashrom utility
 # 
 # redone by Stefan Reinauer <stepan@openbios.org>
 #
@@ -23,7 +23,7 @@
 OBJS = chipset_enable.o board_enable.o udelay.o jedec.o sst28sf040.o \
 	am29f040b.o mx29f002.o sst39sf020.o m29f400bt.o w49f002u.o \
 	82802ab.o msys_doc.o pm49fl004.o sst49lf040.o sst49lfxxxc.o \
-	sst_fwhub.o layout.o lbtable.o flashchips.o flash_rom.o \
+	sst_fwhub.o layout.o lbtable.o flashchips.o flashrom.o \
 	sharplhf00l04.o
 
 all: pciutils dep $(PROGRAM)
diff --git a/flash_rom.c b/flashrom.c
similarity index 99%
rename from flash_rom.c
rename to flashrom.c
index 60c33c0..fddefea 100644
--- a/flash_rom.c
+++ b/flashrom.c
@@ -1,5 +1,5 @@
 /*
- * flash_rom.c: Flash programming utility
+ * flashrom.c: Flash programming utility
  *
  * Copyright 2000 Silicon Integrated System Corporation
  * Copyright 2004 Tyan Corp