diff --git a/Makefile.am b/Makefile.am
index bcbc1c5494b5796a5dcc92d30f801d93efe8fef5..ff1bc1da7b7c72153f8fef2c55c25f8d3dc66f3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,8 @@
 
 AM_CFLAGS = $(OUR_CFLAGS)
 
-bin_PROGRAMS = iop_upgrade
-iop_upgrade_SOURCES = \
+bin_PROGRAMS = iopupgrade
+iopupgrade_SOURCES = \
 	src/main.c \
 	src/log.h \
 	src/image.c \
@@ -22,8 +22,8 @@ iop_upgrade_SOURCES = \
 	src/ubi.c \
 	src/md5sum.c
 
-iop_upgrade_LDADD = $(UCI_LIB) $(UBOX_LIB) $(UBUS_LIB) -lm
+iopupgrade_LDADD = $(UCI_LIB) $(UBOX_LIB) $(UBUS_LIB) -lm
 
-#iop_upgrade_CFLAGS =  $(AM_CFLAGS) -DPRG_VERSION=\"$(PRG_VERSION)\"
-iop_upgrade_CFLAGS =  $(AM_CFLAGS)
+#iopupgrade_CFLAGS =  $(AM_CFLAGS) -DPRG_VERSION=\"$(PRG_VERSION)\"
+iopupgrade_CFLAGS =  $(AM_CFLAGS)
 
diff --git a/README b/README
index 7a82e716c903901a1edbe7e42794f31feeee6053..f0058f0cb8fb225d7132ee37582a6c14ed36477b 100644
--- a/README
+++ b/README
@@ -1,39 +1,39 @@
 
 Help
 ----
-./iop_upgrade -h
+./iopupgrade -h
 
 
 Print headers.
 --------------
-./iop_upgrade -f last.y3 -p
+./iopupgrade -f last.y3 -p
 
 
 Broadcom CFE
 ---
 Extract cfe to file.
-./iop_upgrade -f last.y3 -C cfe_data
+./iopupgrade -f last.y3 -C cfe_data
 
 Burn image to mtd partition
  This needs both the mtd partition device and the nvram offset.
  nvram offset is 1408 or (65536+1408) -> 66944
 
-./iop_upgrade -f last.y3 -c3,4 -N 1408
-./iop_upgrade -f last.y3 -c3,4 -N 66944
+./iopupgrade -f last.y3 -c3,4 -N 1408
+./iopupgrade -f last.y3 -c3,4 -N 66944
 
 
 Broadcom kernel
 ---------------
 program kernel to mtd0 and set sequence number to 2
-./iop_upgrade -f last.y3  -k 0 -s 2
+./iopupgrade -f last.y3  -k 0 -s 2
 
 UBIFS root filesystem
 ---------------------
 extract ubifs image to file 
-./iop_upgrade -f last.y3 -U ubifs.img
+./iopupgrade -f last.y3 -U ubifs.img
 
 burn to ubi volume
-./iop_upgrade -f last.y3  -u ubi0_0
+./iopupgrade -f last.y3  -u ubi0_0
 
 
 -------------------------------------------------------------------------------
@@ -45,7 +45,7 @@ cd mtd-utils/
 git checkout iopsys_target
 make
 
- Put PATH to  imagewrite into $PATH its called from iop_update
+ Put PATH to  imagewrite into $PATH its called from iopupdate
 
 Nand simulator
 ----------------------
diff --git a/configure.ac b/configure.ac
index 789f8eff5ff402763a171dd73c756745a66b0216..f59db68140a79de116d78be90cbfba68939dc48f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl init stuff needs to be first in file
-AC_INIT([iop_upgrade], [0.1], [Kenneth Johansson <kenneth@southpole.se>])
+AC_INIT([iopupgrade], [0.1], [Kenneth Johansson <kenneth@southpole.se>])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AM_SILENT_RULES([yes])