diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index 4648a0f0..39f99bfe 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -174,9 +174,9 @@ static opj_bool opj_jp2_read_jp2h(  opj_jp2_v2_t *jp2,
  *
  * @return true if writting was successful.
 */
-static opj_bool jp2_write_jp2c_v2(	opj_jp2_v2_t *jp2,
-								struct opj_stream_private *cio,
-								struct opj_event_mgr * p_manager );
+static opj_bool opj_jp2_write_jp2c(	opj_jp2_v2_t *jp2,
+								    opj_stream_private_t *cio,
+								    opj_event_mgr_t * p_manager );
 
 static void jp2_write_jp(opj_cio_t *cio);
 
@@ -1427,7 +1427,7 @@ opj_bool opj_jp2_write_ftyp(opj_jp2_v2_t *jp2,
  *
  * @return true if writting was successful.
 */
-opj_bool jp2_write_jp2c_v2(	opj_jp2_v2_t *jp2,
+opj_bool opj_jp2_write_jp2c(opj_jp2_v2_t *jp2,
 							opj_stream_private_t *cio,
 							opj_event_mgr_t * p_manager ) 
 {
@@ -1742,7 +1742,7 @@ void opj_jp2_setup_end_header_writting (opj_jp2_v2_t *jp2)
 	/* preconditions */
 	assert(jp2 != 00);
 
-	opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)jp2_write_jp2c_v2 );
+	opj_procedure_list_add_procedure(jp2->m_procedure_list,(opj_procedure)opj_jp2_write_jp2c );
 	/* DEVELOPER CORNER, add your custom procedures */
 }