diff --git a/applications/codec/image_to_j2k.c b/applications/codec/image_to_j2k.c
index 03de5f23..ca624ad7 100644
--- a/applications/codec/image_to_j2k.c
+++ b/applications/codec/image_to_j2k.c
@@ -1821,7 +1821,7 @@ int main(int argc, char **argv) {
       parameters.cp_tdx = 512;
       parameters.cp_tdy = 512;
     }
-		opj_setup_encoder_v2(l_codec, &parameters, image);
+		opj_setup_encoder(l_codec, &parameters, image);
 
 		/* Open the output file*/
 		fout = fopen(parameters.outfile, "wb");
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index 2f1514cc..3954ddcd 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -673,9 +673,9 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (	FILE * p_file,
 	return l_stream;
 }
 
-opj_bool OPJ_CALLCONV opj_setup_encoder_v2(	opj_codec_t *p_codec, 
-											opj_cparameters_t *parameters, 
-											opj_image_t *p_image)
+opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, 
+										opj_cparameters_t *parameters, 
+										opj_image_t *p_image)
 {
 	if (p_codec && parameters && p_image) {
 		opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index fe591aad..e3ee72a6 100644
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1400,9 +1400,9 @@ OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *
  * @param parameters 	Compression parameters
  * @param image 		Input filled image
  */
-OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder_v2(	opj_codec_t *p_codec, 
-													opj_cparameters_t *parameters, 
-													opj_image_t *image);
+OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, 
+												opj_cparameters_t *parameters, 
+												opj_image_t *image);
 
 /**
  */
diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c
index ea57d269..e1d93b3d 100644
--- a/tests/test_tile_encoder.c
+++ b/tests/test_tile_encoder.c
@@ -271,7 +271,7 @@ int main (int argc, char *argv[])
 	l_image->y1 = image_height;
 	l_image->color_space = CLRSPC_SRGB;
 
-	if (! opj_setup_encoder_v2(l_codec,&l_param,l_image)) {
+	if (! opj_setup_encoder(l_codec,&l_param,l_image)) {
 		fprintf(stderr, "ERROR -> test_tile_encoder: failed to setup the codec!\n");
 		opj_destroy_codec(l_codec);
 		opj_image_destroy(l_image);