diff --git a/applications/codec/j2k_to_image.c b/applications/codec/j2k_to_image.c
index 88917352..1430f926 100644
--- a/applications/codec/j2k_to_image.c
+++ b/applications/codec/j2k_to_image.c
@@ -818,7 +818,7 @@ int main(int argc, char **argv)
 			}
 
 			/* Get the decoded image */
-			if (!(opj_decode_v2(l_codec, l_stream, image) && opj_end_decompress(l_codec,	l_stream))) {
+			if (!(opj_decode(l_codec, l_stream, image) && opj_end_decompress(l_codec,	l_stream))) {
 				fprintf(stderr,"ERROR -> j2k_to_image: failed to decode image!\n");
 				opj_destroy_codec(l_codec);
 				opj_stream_destroy(l_stream);
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index d0d49ad2..05c50d97 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -286,6 +286,9 @@ const char* OPJ_CALLCONV opj_version(void) {
     return PACKAGE_VERSION;
 }
 
+/* ---------------------------------------------------------------------- */
+/* DECOMPRESSION FUNCTIONS*/
+
 opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
 {
 	opj_codec_private_t *l_codec = 00;
@@ -476,40 +479,8 @@ opj_bool OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec,
 	return OPJ_FALSE;
 }
 
-/* DEPRECATED */
-opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format) {
-	opj_cinfo_t *cinfo = (opj_cinfo_t*)opj_calloc(1, sizeof(opj_cinfo_t));
-	if(!cinfo) return NULL;
-	cinfo->is_decompressor = OPJ_FALSE;
-	switch(format) {
-		case CODEC_J2K:
-			/* get a J2K coder handle */
-			cinfo->j2k_handle = (void*)j2k_create_compress((opj_common_ptr)cinfo);
-			if(!cinfo->j2k_handle) {
-				opj_free(cinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JP2:
-			/* get a JP2 coder handle */
-			cinfo->jp2_handle = (void*)jp2_create_compress((opj_common_ptr)cinfo);
-			if(!cinfo->jp2_handle) {
-				opj_free(cinfo);
-				return NULL;
-			}
-			break;
-		case CODEC_JPT:
-		case CODEC_UNKNOWN:
-		default:
-			opj_free(cinfo);
-			return NULL;
-	}
-
-	cinfo->codec_format = format;
-
-	return cinfo;
-}
-
+/* ---------------------------------------------------------------------- */
+/* COMPRESSION FUNCTIONS*/
 
 opj_codec_t* OPJ_CALLCONV opj_create_compress_v2(OPJ_CODEC_FORMAT p_format)
 {
@@ -1103,9 +1074,9 @@ void OPJ_CALLCONV opj_destroy_cstr_index(opj_codestream_index_t **p_cstr_index)
  *
  *
  */
-opj_bool OPJ_CALLCONV opj_decode_v2(opj_codec_t *p_codec,
-									opj_stream_t *p_stream,
-									opj_image_t* p_image)
+opj_bool OPJ_CALLCONV opj_decode(   opj_codec_t *p_codec,
+                                    opj_stream_t *p_stream,
+                                    opj_image_t* p_image)
 {
 	if (p_codec && p_stream) {
 		opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 80bffaca..8e476e30 100644
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1269,9 +1269,9 @@ OPJ_API opj_bool OPJ_CALLCONV opj_set_decode_area(	opj_codec_t *p_codec,
  * @param p_image 			the decoded image
  * @return 					true if success, otherwise false
  * */
-OPJ_API opj_bool OPJ_CALLCONV opj_decode_v2(opj_codec_t *p_decompressor,
-											opj_stream_t *p_stream,
-											opj_image_t *p_image);
+OPJ_API opj_bool OPJ_CALLCONV opj_decode(   opj_codec_t *p_decompressor,
+                                            opj_stream_t *p_stream,
+                                            opj_image_t *p_image);
 
 /**
  * Get the decoded tile from the codec
@@ -1364,13 +1364,6 @@ OPJ_API opj_bool OPJ_CALLCONV opj_decode_tile_data(	opj_codec_t *p_codec,
 
 /* COMPRESSION FUNCTIONS*/
 
-/**
-Creates a J2K/JP2 compression structure
-@param format Coder to select
-@return Returns a handle to a compressor if successful, returns NULL otherwise
-*/
-DEPRECATED( OPJ_API opj_cinfo_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT format));
-
 /**
  * Creates a J2K/JP2 compression structure
  * @param 	format 		Coder to select