diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2fbaaa8..1978a71a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,8 @@ if(NOT OPENJPEG_NAMESPACE)
   set(OPENJPEG_STANDALONE 1)
 endif()
 # In all cases:
-string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+#string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME)
+set(OPENJPEG_LIBRARY_NAME openjp2)
 
 project(${OPENJPEG_NAMESPACE} C)
 
diff --git a/doc/man/man1/image_to_j2k.1 b/doc/man/man1/opj_compress.1
similarity index 91%
rename from doc/man/man1/image_to_j2k.1
rename to doc/man/man1/opj_compress.1
index 331af0eb..d7e41119 100644
--- a/doc/man/man1/image_to_j2k.1
+++ b/doc/man/man1/opj_compress.1
@@ -29,10 +29,10 @@
 .SP
 .fi
 ..
-.TH image_to_j2k 1 "Version 1.4.0" "image_to_j2k" "converts to jpeg2000 files"
+.TH opj_compress 1 "Version 1.4.0" "opj_compress" "converts to jpeg2000 files"
 .P
 .SH NAME
-image_to_j2k - 
+opj_compress - 
 This program reads in an image of a certain type and converts it to a
 jpeg2000 file. It is part of the OpenJPEG library.
 .SP
@@ -43,11 +43,11 @@ Valid output image extensions are
 .B .j2k, .jp2
 .SH SYNOPSIS
 .P
-.B image_to_j2k -i \fRinfile.bmp \fB-o \fRoutfile.j2k
+.B opj_compress -i \fRinfile.bmp \fB-o \fRoutfile.j2k
 .P
-.B image_to_j2k -ImgDir \fRdirectory_name \fB-OutFor \fRjp2
+.B opj_compress -ImgDir \fRdirectory_name \fB-OutFor \fRjp2
 .P
-.B image_to_j2k -h \fRPrint a help message and exit.
+.B opj_compress -h \fRPrint a help message and exit.
 .P
 .R See JPWL OPTIONS for special options
 .SH OPTIONS
@@ -194,13 +194,13 @@ Options usable only if the library has been compiled with \fB-DUSE_JPWL\fR
 .P
 .SH EXAMPLES
 .P
-.B image_to_j2k -i \fRfile.bmp \fB-o \fRfile.j2k \fB-r \fR20,10,1 (compress 20x, then 10x, then lossless).
+.B opj_compress -i \fRfile.bmp \fB-o \fRfile.j2k \fB-r \fR20,10,1 (compress 20x, then 10x, then lossless).
 .P
-.B image_to_j2k -i \fRfile.ppm \fB-o \fRfile.j2k \fB-q \fR30,40,50
+.B opj_compress -i \fRfile.ppm \fB-o \fRfile.j2k \fB-q \fR30,40,50
 .P
-.B image_to_j2k -i \fRfile.pgx \fB-o \fRfile.j2k \fB-POC \fRT1=0,0,1,5,3,CPRL
+.B opj_compress -i \fRfile.pgx \fB-o \fRfile.j2k \fB-POC \fRT1=0,0,1,5,3,CPRL
 .P
-.B image_to_j2k -i \fRlena.raw \fB-o \fRlena.j2k \fB-F \fR512,512,3,8,u
+.B opj_compress -i \fRlena.raw \fB-o \fRlena.j2k \fB-F \fR512,512,3,8,u
 .P
 .SH AUTHORS
 Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium
@@ -218,5 +218,5 @@ Copyright (c) 2005, Herve Drolon, FreeImage Team
 Copyright (c) 2006-2007, Parvatha Elangovan
 .P
 .SH "SEE ALSO"
-j2k_to_image(1) j2k_dump(1)
+opj_decompress(1) opj_dump(1)
 
diff --git a/doc/man/man1/j2k_to_image.1 b/doc/man/man1/opj_decompress.1
similarity index 90%
rename from doc/man/man1/j2k_to_image.1
rename to doc/man/man1/opj_decompress.1
index 733a37dc..e276b423 100644
--- a/doc/man/man1/j2k_to_image.1
+++ b/doc/man/man1/opj_decompress.1
@@ -29,10 +29,10 @@
 .SP
 .fi
 ..
-.TH j2k_to_image 1 "Version 1.4.0" "j2k_to_image" "converts jpeg2000 files"
+.TH opj_decompress 1 "Version 1.4.0" "opj_decompress" "converts jpeg2000 files"
 .P
 .SH NAME
-j2k_to_image - 
+opj_decompress - 
 This program reads in a jpeg2000 image and converts it to another 
 image type. It is part of the OpenJPEG library.
 .SP
@@ -43,11 +43,11 @@ Valid output image extensions are
 .B .bmp, .pgm, .pgx, .png, .pnm, .ppm, .raw, .tga, .tif \fR. For PNG resp. TIF it needs libpng resp. libtiff .
 .SH SYNOPSIS
 .P
-.B j2k_to_image -i \fRinfile.j2k \fB-o \fRoutfile.png
+.B opj_decompress -i \fRinfile.j2k \fB-o \fRoutfile.png
 .P
-.B j2k_to_image -ImgDir \fRimages/ \fB-OutFor \fRbmp
+.B opj_decompress -ImgDir \fRimages/ \fB-OutFor \fRbmp
 .P
-.B j2k_to_image -h  \fRPrint help message and exit
+.B opj_decompress -h  \fRPrint help message and exit
 .P
 .R See JPWL OPTIONS for special options
 .SH OPTIONS
@@ -106,4 +106,4 @@ Copyright (c) 2005, Herve Drolon, FreeImage Team
 Copyright (c) 2006-2007, Parvatha Elangovan
 .P
 .SH "SEE ALSO"
-image_to_j2k(1) j2k_dump(1)
+opj_compress(1) opj_dump(1)
diff --git a/doc/man/man1/j2k_dump.1 b/doc/man/man1/opj_dump.1
similarity index 79%
rename from doc/man/man1/j2k_dump.1
rename to doc/man/man1/opj_dump.1
index c45e9f49..87ec6485 100644
--- a/doc/man/man1/j2k_dump.1
+++ b/doc/man/man1/opj_dump.1
@@ -29,10 +29,10 @@
 .SP
 .fi
 ..
-.TH j2k_dump 1 "Version 1.4.0" "j2k_dump" "dumps jpeg2000 files"
+.TH opj_dump 1 "Version 1.4.0" "opj_dump" "dumps jpeg2000 files"
 .P
 .SH NAME
-j2k_dump - 
+opj_dump - 
 This program reads in a jpeg2000 image and dumps the contents to stdout. It is part of the OpenJPEG library.
 .SP
 Valid input image extensions are
@@ -40,11 +40,11 @@ Valid input image extensions are
 .SP
 .SH SYNOPSIS
 .P
-.B j2k_dump -i \fRinfile.j2k 
+.B opj_dump -i \fRinfile.j2k 
 .P
-.B j2k_dump -ImgDir \fRimages/ \fRDump all files in images/
+.B opj_dump -ImgDir \fRimages/ \fRDump all files in images/
 .P
-.B j2k_dump -h  \fRPrint help message and exit
+.B opj_dump -h  \fRPrint help message and exit
 .P
 .SH OPTIONS
 .TP
@@ -59,4 +59,4 @@ Valid input image extensions are
 Copyright (c) 20010, Mathieu Malaterre
 .P
 .SH "SEE ALSO"
-image_to_j2k(1) j2k_to_image(1)
+opj_compress(1) opj_decompress(1)
diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index 5e77765e..f25b8470 100644
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -27,7 +27,7 @@ if(WIN32)
 endif()
 
 # Loop over all executables:
-foreach(exe j2k_to_image image_to_j2k j2k_dump)
+foreach(exe opj_decompress opj_compress opj_dump)
   add_executable(${exe} ${exe}.c ${common_SRCS})
   target_link_libraries(${exe} ${OPENJPEG_LIBRARY_NAME}
     ${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
@@ -52,9 +52,9 @@ endforeach()
 
 # Install man pages
 install(
-  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/image_to_j2k.1
-              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_dump.1
-              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/j2k_to_image.1
+  FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1
+              ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
 #
 
diff --git a/src/bin/jp2/README b/src/bin/jp2/README
deleted file mode 100644
index 80049980..00000000
--- a/src/bin/jp2/README
+++ /dev/null
@@ -1,8 +0,0 @@
-Simple codec compilation
-------------------------
-Once you've built the library, you might want to test it with a basic codec. To do this, go to the codec directory and either use the provided Makefile or use one of the following commands to build an encoder and decoder respectively:
-
-gcc index.c convert.c image_to_j2k.c -o image_to_j2k -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-gcc index.c convert.c j2k_to_image.c -o j2k_to_image -lopenjpeg -I ../libopenjpeg/ -lm -ltiff
-
-You should add '-L..' to those lines if you did not use the 'install' target when building the library.
\ No newline at end of file
diff --git a/src/bin/jp2/image_to_j2k.c b/src/bin/jp2/opj_compress.c
similarity index 100%
rename from src/bin/jp2/image_to_j2k.c
rename to src/bin/jp2/opj_compress.c
diff --git a/src/bin/jp2/j2k_to_image.c b/src/bin/jp2/opj_decompress.c
similarity index 100%
rename from src/bin/jp2/j2k_to_image.c
rename to src/bin/jp2/opj_decompress.c
diff --git a/src/bin/jp2/j2k_dump.c b/src/bin/jp2/opj_dump.c
similarity index 100%
rename from src/bin/jp2/j2k_dump.c
rename to src/bin/jp2/opj_dump.c