asn1_* renamed into asn_*


git-svn-id: https://asn1c.svn.sourceforge.net/svnroot/asn1c/trunk@439 59561ff5-6e30-0410-9f3c-9617f08c8826
diff --git a/tests/50-constraint-OK.asn1.-P b/tests/50-constraint-OK.asn1.-P
index 6696b56..b8c0c35 100644
--- a/tests/50-constraint-OK.asn1.-P
+++ b/tests/50-constraint-OK.asn1.-P
@@ -11,7 +11,7 @@
 /*** <<< FUNC-DECLS [Int1] >>> ***/
 
 /* This type is equivalent to INTEGER */
-#define	asn1_DEF_Int1	asn1_DEF_INTEGER
+#define	asn_DEF_Int1	asn_DEF_INTEGER
 
 /*** <<< CODE [Int1] >>> ***/
 
@@ -29,7 +29,7 @@
 
 /*** <<< FUNC-DECLS [Int2] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Int2;
+extern asn_TYPE_descriptor_t asn_DEF_Int2;
 asn_struct_free_f Int2_free;
 asn_struct_print_f Int2_print;
 asn_constr_check_f Int2_constraint;
@@ -40,7 +40,7 @@
 /*** <<< CODE [Int2] >>> ***/
 
 int
-Int2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Int2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Int1_t *st = sptr;
 	long value;
@@ -71,41 +71,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Int2_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Int1.free_struct;
-	td->print_struct   = asn1_DEF_Int1.print_struct;
-	td->ber_decoder    = asn1_DEF_Int1.ber_decoder;
-	td->der_encoder    = asn1_DEF_Int1.der_encoder;
-	td->xer_decoder    = asn1_DEF_Int1.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Int1.xer_encoder;
-	td->elements       = asn1_DEF_Int1.elements;
-	td->elements_count = asn1_DEF_Int1.elements_count;
-	td->specifics      = asn1_DEF_Int1.specifics;
+Int2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Int1.free_struct;
+	td->print_struct   = asn_DEF_Int1.print_struct;
+	td->ber_decoder    = asn_DEF_Int1.ber_decoder;
+	td->der_encoder    = asn_DEF_Int1.der_encoder;
+	td->xer_decoder    = asn_DEF_Int1.xer_decoder;
+	td->xer_encoder    = asn_DEF_Int1.xer_encoder;
+	td->elements       = asn_DEF_Int1.elements;
+	td->elements_count = asn_DEF_Int1.elements_count;
+	td->specifics      = asn_DEF_Int1.specifics;
 }
 
 void
-Int2_free(asn1_TYPE_descriptor_t *td,
+Int2_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Int2_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Int2_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Int2_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Int2_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Int2_decode_ber(asn1_TYPE_descriptor_t *td,
+Int2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Int2_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Int2_encode_der(asn1_TYPE_descriptor_t *td,
+Int2_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int2_inherit_TYPE_descriptor(td);
@@ -113,7 +113,7 @@
 }
 
 asn_enc_rval_t
-Int2_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Int2_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int2_inherit_TYPE_descriptor(td);
@@ -123,10 +123,10 @@
 
 /*** <<< STAT-DEFS [Int2] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Int2_tags[] = {
+static ber_tlv_tag_t asn_DEF_Int2_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Int2 = {
+asn_TYPE_descriptor_t asn_DEF_Int2 = {
 	"Int2",
 	Int2_free,
 	Int2_print,
@@ -136,12 +136,12 @@
 	0,				/* Not implemented yet */
 	Int2_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Int2_tags,
-	sizeof(asn1_DEF_Int2_tags)
-		/sizeof(asn1_DEF_Int2_tags[0]), /* 1 */
-	asn1_DEF_Int2_tags,	/* Same as above */
-	sizeof(asn1_DEF_Int2_tags)
-		/sizeof(asn1_DEF_Int2_tags[0]), /* 1 */
+	asn_DEF_Int2_tags,
+	sizeof(asn_DEF_Int2_tags)
+		/sizeof(asn_DEF_Int2_tags[0]), /* 1 */
+	asn_DEF_Int2_tags,	/* Same as above */
+	sizeof(asn_DEF_Int2_tags)
+		/sizeof(asn_DEF_Int2_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -158,7 +158,7 @@
 
 /*** <<< FUNC-DECLS [Int3] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Int3;
+extern asn_TYPE_descriptor_t asn_DEF_Int3;
 asn_struct_free_f Int3_free;
 asn_struct_print_f Int3_print;
 asn_constr_check_f Int3_constraint;
@@ -169,7 +169,7 @@
 /*** <<< CODE [Int3] >>> ***/
 
 int
-Int3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Int3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Int2_t *st = sptr;
 	long value;
@@ -181,7 +181,7 @@
 		return -1;
 	}
 	
-	if(asn1_INTEGER2long(st, &value)) {
+	if(asn_INTEGER2long(st, &value)) {
 		_ASN_ERRLOG(app_errlog, app_key,
 			"%s: value too large (%s:%d)",
 			td->name, __FILE__, __LINE__);
@@ -204,41 +204,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Int3_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Int2.free_struct;
-	td->print_struct   = asn1_DEF_Int2.print_struct;
-	td->ber_decoder    = asn1_DEF_Int2.ber_decoder;
-	td->der_encoder    = asn1_DEF_Int2.der_encoder;
-	td->xer_decoder    = asn1_DEF_Int2.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Int2.xer_encoder;
-	td->elements       = asn1_DEF_Int2.elements;
-	td->elements_count = asn1_DEF_Int2.elements_count;
-	td->specifics      = asn1_DEF_Int2.specifics;
+Int3_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Int2.free_struct;
+	td->print_struct   = asn_DEF_Int2.print_struct;
+	td->ber_decoder    = asn_DEF_Int2.ber_decoder;
+	td->der_encoder    = asn_DEF_Int2.der_encoder;
+	td->xer_decoder    = asn_DEF_Int2.xer_decoder;
+	td->xer_encoder    = asn_DEF_Int2.xer_encoder;
+	td->elements       = asn_DEF_Int2.elements;
+	td->elements_count = asn_DEF_Int2.elements_count;
+	td->specifics      = asn_DEF_Int2.specifics;
 }
 
 void
-Int3_free(asn1_TYPE_descriptor_t *td,
+Int3_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Int3_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Int3_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Int3_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Int3_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Int3_decode_ber(asn1_TYPE_descriptor_t *td,
+Int3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Int3_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Int3_encode_der(asn1_TYPE_descriptor_t *td,
+Int3_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int3_inherit_TYPE_descriptor(td);
@@ -246,7 +246,7 @@
 }
 
 asn_enc_rval_t
-Int3_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Int3_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int3_inherit_TYPE_descriptor(td);
@@ -256,10 +256,10 @@
 
 /*** <<< STAT-DEFS [Int3] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Int3_tags[] = {
+static ber_tlv_tag_t asn_DEF_Int3_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Int3 = {
+asn_TYPE_descriptor_t asn_DEF_Int3 = {
 	"Int3",
 	Int3_free,
 	Int3_print,
@@ -269,12 +269,12 @@
 	0,				/* Not implemented yet */
 	Int3_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Int3_tags,
-	sizeof(asn1_DEF_Int3_tags)
-		/sizeof(asn1_DEF_Int3_tags[0]), /* 1 */
-	asn1_DEF_Int3_tags,	/* Same as above */
-	sizeof(asn1_DEF_Int3_tags)
-		/sizeof(asn1_DEF_Int3_tags[0]), /* 1 */
+	asn_DEF_Int3_tags,
+	sizeof(asn_DEF_Int3_tags)
+		/sizeof(asn_DEF_Int3_tags[0]), /* 1 */
+	asn_DEF_Int3_tags,	/* Same as above */
+	sizeof(asn_DEF_Int3_tags)
+		/sizeof(asn_DEF_Int3_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -291,7 +291,7 @@
 
 /*** <<< FUNC-DECLS [Int4] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Int4;
+extern asn_TYPE_descriptor_t asn_DEF_Int4;
 asn_struct_free_f Int4_free;
 asn_struct_print_f Int4_print;
 asn_constr_check_f Int4_constraint;
@@ -302,7 +302,7 @@
 /*** <<< CODE [Int4] >>> ***/
 
 int
-Int4_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Int4_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Int3_t *st = sptr;
 	long value;
@@ -314,7 +314,7 @@
 		return -1;
 	}
 	
-	if(asn1_INTEGER2long(st, &value)) {
+	if(asn_INTEGER2long(st, &value)) {
 		_ASN_ERRLOG(app_errlog, app_key,
 			"%s: value too large (%s:%d)",
 			td->name, __FILE__, __LINE__);
@@ -337,41 +337,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Int4_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Int3.free_struct;
-	td->print_struct   = asn1_DEF_Int3.print_struct;
-	td->ber_decoder    = asn1_DEF_Int3.ber_decoder;
-	td->der_encoder    = asn1_DEF_Int3.der_encoder;
-	td->xer_decoder    = asn1_DEF_Int3.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Int3.xer_encoder;
-	td->elements       = asn1_DEF_Int3.elements;
-	td->elements_count = asn1_DEF_Int3.elements_count;
-	td->specifics      = asn1_DEF_Int3.specifics;
+Int4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Int3.free_struct;
+	td->print_struct   = asn_DEF_Int3.print_struct;
+	td->ber_decoder    = asn_DEF_Int3.ber_decoder;
+	td->der_encoder    = asn_DEF_Int3.der_encoder;
+	td->xer_decoder    = asn_DEF_Int3.xer_decoder;
+	td->xer_encoder    = asn_DEF_Int3.xer_encoder;
+	td->elements       = asn_DEF_Int3.elements;
+	td->elements_count = asn_DEF_Int3.elements_count;
+	td->specifics      = asn_DEF_Int3.specifics;
 }
 
 void
-Int4_free(asn1_TYPE_descriptor_t *td,
+Int4_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Int4_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Int4_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Int4_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Int4_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Int4_decode_ber(asn1_TYPE_descriptor_t *td,
+Int4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Int4_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Int4_encode_der(asn1_TYPE_descriptor_t *td,
+Int4_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int4_inherit_TYPE_descriptor(td);
@@ -379,7 +379,7 @@
 }
 
 asn_enc_rval_t
-Int4_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Int4_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int4_inherit_TYPE_descriptor(td);
@@ -389,10 +389,10 @@
 
 /*** <<< STAT-DEFS [Int4] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Int4_tags[] = {
+static ber_tlv_tag_t asn_DEF_Int4_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Int4 = {
+asn_TYPE_descriptor_t asn_DEF_Int4 = {
 	"Int4",
 	Int4_free,
 	Int4_print,
@@ -402,12 +402,12 @@
 	0,				/* Not implemented yet */
 	Int4_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Int4_tags,
-	sizeof(asn1_DEF_Int4_tags)
-		/sizeof(asn1_DEF_Int4_tags[0]), /* 1 */
-	asn1_DEF_Int4_tags,	/* Same as above */
-	sizeof(asn1_DEF_Int4_tags)
-		/sizeof(asn1_DEF_Int4_tags[0]), /* 1 */
+	asn_DEF_Int4_tags,
+	sizeof(asn_DEF_Int4_tags)
+		/sizeof(asn_DEF_Int4_tags[0]), /* 1 */
+	asn_DEF_Int4_tags,	/* Same as above */
+	sizeof(asn_DEF_Int4_tags)
+		/sizeof(asn_DEF_Int4_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -424,7 +424,7 @@
 
 /*** <<< FUNC-DECLS [Int5] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Int5;
+extern asn_TYPE_descriptor_t asn_DEF_Int5;
 asn_struct_free_f Int5_free;
 asn_struct_print_f Int5_print;
 asn_constr_check_f Int5_constraint;
@@ -435,7 +435,7 @@
 /*** <<< CODE [Int5] >>> ***/
 
 int
-Int5_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Int5_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Int4_t *st = sptr;
 	long value;
@@ -447,7 +447,7 @@
 		return -1;
 	}
 	
-	if(asn1_INTEGER2long(st, &value)) {
+	if(asn_INTEGER2long(st, &value)) {
 		_ASN_ERRLOG(app_errlog, app_key,
 			"%s: value too large (%s:%d)",
 			td->name, __FILE__, __LINE__);
@@ -470,41 +470,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Int5_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Int4.free_struct;
-	td->print_struct   = asn1_DEF_Int4.print_struct;
-	td->ber_decoder    = asn1_DEF_Int4.ber_decoder;
-	td->der_encoder    = asn1_DEF_Int4.der_encoder;
-	td->xer_decoder    = asn1_DEF_Int4.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Int4.xer_encoder;
-	td->elements       = asn1_DEF_Int4.elements;
-	td->elements_count = asn1_DEF_Int4.elements_count;
-	td->specifics      = asn1_DEF_Int4.specifics;
+Int5_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Int4.free_struct;
+	td->print_struct   = asn_DEF_Int4.print_struct;
+	td->ber_decoder    = asn_DEF_Int4.ber_decoder;
+	td->der_encoder    = asn_DEF_Int4.der_encoder;
+	td->xer_decoder    = asn_DEF_Int4.xer_decoder;
+	td->xer_encoder    = asn_DEF_Int4.xer_encoder;
+	td->elements       = asn_DEF_Int4.elements;
+	td->elements_count = asn_DEF_Int4.elements_count;
+	td->specifics      = asn_DEF_Int4.specifics;
 }
 
 void
-Int5_free(asn1_TYPE_descriptor_t *td,
+Int5_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Int5_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Int5_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Int5_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Int5_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Int5_decode_ber(asn1_TYPE_descriptor_t *td,
+Int5_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Int5_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Int5_encode_der(asn1_TYPE_descriptor_t *td,
+Int5_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int5_inherit_TYPE_descriptor(td);
@@ -512,7 +512,7 @@
 }
 
 asn_enc_rval_t
-Int5_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Int5_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Int5_inherit_TYPE_descriptor(td);
@@ -522,10 +522,10 @@
 
 /*** <<< STAT-DEFS [Int5] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Int5_tags[] = {
+static ber_tlv_tag_t asn_DEF_Int5_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Int5 = {
+asn_TYPE_descriptor_t asn_DEF_Int5 = {
 	"Int5",
 	Int5_free,
 	Int5_print,
@@ -535,12 +535,12 @@
 	0,				/* Not implemented yet */
 	Int5_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Int5_tags,
-	sizeof(asn1_DEF_Int5_tags)
-		/sizeof(asn1_DEF_Int5_tags[0]), /* 1 */
-	asn1_DEF_Int5_tags,	/* Same as above */
-	sizeof(asn1_DEF_Int5_tags)
-		/sizeof(asn1_DEF_Int5_tags[0]), /* 1 */
+	asn_DEF_Int5_tags,
+	sizeof(asn_DEF_Int5_tags)
+		/sizeof(asn_DEF_Int5_tags[0]), /* 1 */
+	asn_DEF_Int5_tags,	/* Same as above */
+	sizeof(asn_DEF_Int5_tags)
+		/sizeof(asn_DEF_Int5_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -557,7 +557,7 @@
 
 /*** <<< FUNC-DECLS [ExtensibleExtensions] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_ExtensibleExtensions;
+extern asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions;
 asn_struct_free_f ExtensibleExtensions_free;
 asn_struct_print_f ExtensibleExtensions_print;
 asn_constr_check_f ExtensibleExtensions_constraint;
@@ -568,7 +568,7 @@
 /*** <<< CODE [ExtensibleExtensions] >>> ***/
 
 int
-ExtensibleExtensions_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+ExtensibleExtensions_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const INTEGER_t *st = sptr;
 	long value;
@@ -580,7 +580,7 @@
 		return -1;
 	}
 	
-	if(asn1_INTEGER2long(st, &value)) {
+	if(asn_INTEGER2long(st, &value)) {
 		_ASN_ERRLOG(app_errlog, app_key,
 			"%s: value too large (%s:%d)",
 			td->name, __FILE__, __LINE__);
@@ -603,41 +603,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-ExtensibleExtensions_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_INTEGER.free_struct;
-	td->print_struct   = asn1_DEF_INTEGER.print_struct;
-	td->ber_decoder    = asn1_DEF_INTEGER.ber_decoder;
-	td->der_encoder    = asn1_DEF_INTEGER.der_encoder;
-	td->xer_decoder    = asn1_DEF_INTEGER.xer_decoder;
-	td->xer_encoder    = asn1_DEF_INTEGER.xer_encoder;
-	td->elements       = asn1_DEF_INTEGER.elements;
-	td->elements_count = asn1_DEF_INTEGER.elements_count;
-	td->specifics      = asn1_DEF_INTEGER.specifics;
+ExtensibleExtensions_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_INTEGER.free_struct;
+	td->print_struct   = asn_DEF_INTEGER.print_struct;
+	td->ber_decoder    = asn_DEF_INTEGER.ber_decoder;
+	td->der_encoder    = asn_DEF_INTEGER.der_encoder;
+	td->xer_decoder    = asn_DEF_INTEGER.xer_decoder;
+	td->xer_encoder    = asn_DEF_INTEGER.xer_encoder;
+	td->elements       = asn_DEF_INTEGER.elements;
+	td->elements_count = asn_DEF_INTEGER.elements_count;
+	td->specifics      = asn_DEF_INTEGER.specifics;
 }
 
 void
-ExtensibleExtensions_free(asn1_TYPE_descriptor_t *td,
+ExtensibleExtensions_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	ExtensibleExtensions_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-ExtensibleExtensions_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+ExtensibleExtensions_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	ExtensibleExtensions_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-ExtensibleExtensions_decode_ber(asn1_TYPE_descriptor_t *td,
+ExtensibleExtensions_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	ExtensibleExtensions_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-ExtensibleExtensions_encode_der(asn1_TYPE_descriptor_t *td,
+ExtensibleExtensions_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	ExtensibleExtensions_inherit_TYPE_descriptor(td);
@@ -645,7 +645,7 @@
 }
 
 asn_enc_rval_t
-ExtensibleExtensions_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+ExtensibleExtensions_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	ExtensibleExtensions_inherit_TYPE_descriptor(td);
@@ -655,10 +655,10 @@
 
 /*** <<< STAT-DEFS [ExtensibleExtensions] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_ExtensibleExtensions_tags[] = {
+static ber_tlv_tag_t asn_DEF_ExtensibleExtensions_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_ExtensibleExtensions = {
+asn_TYPE_descriptor_t asn_DEF_ExtensibleExtensions = {
 	"ExtensibleExtensions",
 	ExtensibleExtensions_free,
 	ExtensibleExtensions_print,
@@ -668,12 +668,12 @@
 	0,				/* Not implemented yet */
 	ExtensibleExtensions_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_ExtensibleExtensions_tags,
-	sizeof(asn1_DEF_ExtensibleExtensions_tags)
-		/sizeof(asn1_DEF_ExtensibleExtensions_tags[0]), /* 1 */
-	asn1_DEF_ExtensibleExtensions_tags,	/* Same as above */
-	sizeof(asn1_DEF_ExtensibleExtensions_tags)
-		/sizeof(asn1_DEF_ExtensibleExtensions_tags[0]), /* 1 */
+	asn_DEF_ExtensibleExtensions_tags,
+	sizeof(asn_DEF_ExtensibleExtensions_tags)
+		/sizeof(asn_DEF_ExtensibleExtensions_tags[0]), /* 1 */
+	asn_DEF_ExtensibleExtensions_tags,	/* Same as above */
+	sizeof(asn_DEF_ExtensibleExtensions_tags)
+		/sizeof(asn_DEF_ExtensibleExtensions_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -691,7 +691,7 @@
 /*** <<< FUNC-DECLS [Str1] >>> ***/
 
 /* This type is equivalent to IA5String */
-#define	asn1_DEF_Str1	asn1_DEF_IA5String
+#define	asn_DEF_Str1	asn_DEF_IA5String
 
 /*** <<< CODE [Str1] >>> ***/
 
@@ -709,7 +709,7 @@
 
 /*** <<< FUNC-DECLS [Str2] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Str2;
+extern asn_TYPE_descriptor_t asn_DEF_Str2;
 asn_struct_free_f Str2_free;
 asn_struct_print_f Str2_print;
 asn_constr_check_f Str2_constraint;
@@ -736,7 +736,7 @@
 /*** <<< CODE [Str2] >>> ***/
 
 int
-Str2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Str2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Str1_t *st = sptr;
 	size_t size;
@@ -767,41 +767,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Str2_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Str1.free_struct;
-	td->print_struct   = asn1_DEF_Str1.print_struct;
-	td->ber_decoder    = asn1_DEF_Str1.ber_decoder;
-	td->der_encoder    = asn1_DEF_Str1.der_encoder;
-	td->xer_decoder    = asn1_DEF_Str1.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Str1.xer_encoder;
-	td->elements       = asn1_DEF_Str1.elements;
-	td->elements_count = asn1_DEF_Str1.elements_count;
-	td->specifics      = asn1_DEF_Str1.specifics;
+Str2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Str1.free_struct;
+	td->print_struct   = asn_DEF_Str1.print_struct;
+	td->ber_decoder    = asn_DEF_Str1.ber_decoder;
+	td->der_encoder    = asn_DEF_Str1.der_encoder;
+	td->xer_decoder    = asn_DEF_Str1.xer_decoder;
+	td->xer_encoder    = asn_DEF_Str1.xer_encoder;
+	td->elements       = asn_DEF_Str1.elements;
+	td->elements_count = asn_DEF_Str1.elements_count;
+	td->specifics      = asn_DEF_Str1.specifics;
 }
 
 void
-Str2_free(asn1_TYPE_descriptor_t *td,
+Str2_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Str2_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Str2_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Str2_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Str2_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Str2_decode_ber(asn1_TYPE_descriptor_t *td,
+Str2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Str2_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Str2_encode_der(asn1_TYPE_descriptor_t *td,
+Str2_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Str2_inherit_TYPE_descriptor(td);
@@ -809,7 +809,7 @@
 }
 
 asn_enc_rval_t
-Str2_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Str2_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Str2_inherit_TYPE_descriptor(td);
@@ -819,10 +819,10 @@
 
 /*** <<< STAT-DEFS [Str2] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Str2_tags[] = {
+static ber_tlv_tag_t asn_DEF_Str2_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Str2 = {
+asn_TYPE_descriptor_t asn_DEF_Str2 = {
 	"Str2",
 	Str2_free,
 	Str2_print,
@@ -832,12 +832,12 @@
 	0,				/* Not implemented yet */
 	Str2_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Str2_tags,
-	sizeof(asn1_DEF_Str2_tags)
-		/sizeof(asn1_DEF_Str2_tags[0]), /* 1 */
-	asn1_DEF_Str2_tags,	/* Same as above */
-	sizeof(asn1_DEF_Str2_tags)
-		/sizeof(asn1_DEF_Str2_tags[0]), /* 1 */
+	asn_DEF_Str2_tags,
+	sizeof(asn_DEF_Str2_tags)
+		/sizeof(asn_DEF_Str2_tags[0]), /* 1 */
+	asn_DEF_Str2_tags,	/* Same as above */
+	sizeof(asn_DEF_Str2_tags)
+		/sizeof(asn_DEF_Str2_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -854,7 +854,7 @@
 
 /*** <<< FUNC-DECLS [Str3] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Str3;
+extern asn_TYPE_descriptor_t asn_DEF_Str3;
 asn_struct_free_f Str3_free;
 asn_struct_print_f Str3_print;
 asn_constr_check_f Str3_constraint;
@@ -892,7 +892,7 @@
 /*** <<< CODE [Str3] >>> ***/
 
 int
-Str3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Str3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Str2_t *st = sptr;
 	size_t size;
@@ -923,41 +923,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Str3_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Str2.free_struct;
-	td->print_struct   = asn1_DEF_Str2.print_struct;
-	td->ber_decoder    = asn1_DEF_Str2.ber_decoder;
-	td->der_encoder    = asn1_DEF_Str2.der_encoder;
-	td->xer_decoder    = asn1_DEF_Str2.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Str2.xer_encoder;
-	td->elements       = asn1_DEF_Str2.elements;
-	td->elements_count = asn1_DEF_Str2.elements_count;
-	td->specifics      = asn1_DEF_Str2.specifics;
+Str3_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Str2.free_struct;
+	td->print_struct   = asn_DEF_Str2.print_struct;
+	td->ber_decoder    = asn_DEF_Str2.ber_decoder;
+	td->der_encoder    = asn_DEF_Str2.der_encoder;
+	td->xer_decoder    = asn_DEF_Str2.xer_decoder;
+	td->xer_encoder    = asn_DEF_Str2.xer_encoder;
+	td->elements       = asn_DEF_Str2.elements;
+	td->elements_count = asn_DEF_Str2.elements_count;
+	td->specifics      = asn_DEF_Str2.specifics;
 }
 
 void
-Str3_free(asn1_TYPE_descriptor_t *td,
+Str3_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Str3_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Str3_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Str3_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Str3_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Str3_decode_ber(asn1_TYPE_descriptor_t *td,
+Str3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Str3_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Str3_encode_der(asn1_TYPE_descriptor_t *td,
+Str3_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Str3_inherit_TYPE_descriptor(td);
@@ -965,7 +965,7 @@
 }
 
 asn_enc_rval_t
-Str3_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Str3_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Str3_inherit_TYPE_descriptor(td);
@@ -975,10 +975,10 @@
 
 /*** <<< STAT-DEFS [Str3] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Str3_tags[] = {
+static ber_tlv_tag_t asn_DEF_Str3_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Str3 = {
+asn_TYPE_descriptor_t asn_DEF_Str3 = {
 	"Str3",
 	Str3_free,
 	Str3_print,
@@ -988,12 +988,12 @@
 	0,				/* Not implemented yet */
 	Str3_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Str3_tags,
-	sizeof(asn1_DEF_Str3_tags)
-		/sizeof(asn1_DEF_Str3_tags[0]), /* 1 */
-	asn1_DEF_Str3_tags,	/* Same as above */
-	sizeof(asn1_DEF_Str3_tags)
-		/sizeof(asn1_DEF_Str3_tags[0]), /* 1 */
+	asn_DEF_Str3_tags,
+	sizeof(asn_DEF_Str3_tags)
+		/sizeof(asn_DEF_Str3_tags[0]), /* 1 */
+	asn_DEF_Str3_tags,	/* Same as above */
+	sizeof(asn_DEF_Str3_tags)
+		/sizeof(asn_DEF_Str3_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -1010,7 +1010,7 @@
 
 /*** <<< FUNC-DECLS [Str4] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Str4;
+extern asn_TYPE_descriptor_t asn_DEF_Str4;
 asn_struct_free_f Str4_free;
 asn_struct_print_f Str4_print;
 asn_constr_check_f Str4_constraint;
@@ -1037,7 +1037,7 @@
 /*** <<< CODE [Str4] >>> ***/
 
 int
-Str4_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Str4_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const IA5String_t *st = sptr;
 	
@@ -1065,41 +1065,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Str4_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_IA5String.free_struct;
-	td->print_struct   = asn1_DEF_IA5String.print_struct;
-	td->ber_decoder    = asn1_DEF_IA5String.ber_decoder;
-	td->der_encoder    = asn1_DEF_IA5String.der_encoder;
-	td->xer_decoder    = asn1_DEF_IA5String.xer_decoder;
-	td->xer_encoder    = asn1_DEF_IA5String.xer_encoder;
-	td->elements       = asn1_DEF_IA5String.elements;
-	td->elements_count = asn1_DEF_IA5String.elements_count;
-	td->specifics      = asn1_DEF_IA5String.specifics;
+Str4_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_IA5String.free_struct;
+	td->print_struct   = asn_DEF_IA5String.print_struct;
+	td->ber_decoder    = asn_DEF_IA5String.ber_decoder;
+	td->der_encoder    = asn_DEF_IA5String.der_encoder;
+	td->xer_decoder    = asn_DEF_IA5String.xer_decoder;
+	td->xer_encoder    = asn_DEF_IA5String.xer_encoder;
+	td->elements       = asn_DEF_IA5String.elements;
+	td->elements_count = asn_DEF_IA5String.elements_count;
+	td->specifics      = asn_DEF_IA5String.specifics;
 }
 
 void
-Str4_free(asn1_TYPE_descriptor_t *td,
+Str4_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Str4_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Str4_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Str4_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Str4_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Str4_decode_ber(asn1_TYPE_descriptor_t *td,
+Str4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Str4_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Str4_encode_der(asn1_TYPE_descriptor_t *td,
+Str4_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Str4_inherit_TYPE_descriptor(td);
@@ -1107,7 +1107,7 @@
 }
 
 asn_enc_rval_t
-Str4_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Str4_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Str4_inherit_TYPE_descriptor(td);
@@ -1117,10 +1117,10 @@
 
 /*** <<< STAT-DEFS [Str4] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Str4_tags[] = {
+static ber_tlv_tag_t asn_DEF_Str4_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Str4 = {
+asn_TYPE_descriptor_t asn_DEF_Str4 = {
 	"Str4",
 	Str4_free,
 	Str4_print,
@@ -1130,12 +1130,12 @@
 	0,				/* Not implemented yet */
 	Str4_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Str4_tags,
-	sizeof(asn1_DEF_Str4_tags)
-		/sizeof(asn1_DEF_Str4_tags[0]), /* 1 */
-	asn1_DEF_Str4_tags,	/* Same as above */
-	sizeof(asn1_DEF_Str4_tags)
-		/sizeof(asn1_DEF_Str4_tags[0]), /* 1 */
+	asn_DEF_Str4_tags,
+	sizeof(asn_DEF_Str4_tags)
+		/sizeof(asn_DEF_Str4_tags[0]), /* 1 */
+	asn_DEF_Str4_tags,	/* Same as above */
+	sizeof(asn_DEF_Str4_tags)
+		/sizeof(asn_DEF_Str4_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -1152,7 +1152,7 @@
 
 /*** <<< FUNC-DECLS [PER-Visible] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_PER_Visible;
+extern asn_TYPE_descriptor_t asn_DEF_PER_Visible;
 asn_struct_free_f PER_Visible_free;
 asn_struct_print_f PER_Visible_print;
 asn_constr_check_f PER_Visible_constraint;
@@ -1179,7 +1179,7 @@
 /*** <<< CODE [PER-Visible] >>> ***/
 
 int
-PER_Visible_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+PER_Visible_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const IA5String_t *st = sptr;
 	
@@ -1207,41 +1207,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-PER_Visible_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_IA5String.free_struct;
-	td->print_struct   = asn1_DEF_IA5String.print_struct;
-	td->ber_decoder    = asn1_DEF_IA5String.ber_decoder;
-	td->der_encoder    = asn1_DEF_IA5String.der_encoder;
-	td->xer_decoder    = asn1_DEF_IA5String.xer_decoder;
-	td->xer_encoder    = asn1_DEF_IA5String.xer_encoder;
-	td->elements       = asn1_DEF_IA5String.elements;
-	td->elements_count = asn1_DEF_IA5String.elements_count;
-	td->specifics      = asn1_DEF_IA5String.specifics;
+PER_Visible_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_IA5String.free_struct;
+	td->print_struct   = asn_DEF_IA5String.print_struct;
+	td->ber_decoder    = asn_DEF_IA5String.ber_decoder;
+	td->der_encoder    = asn_DEF_IA5String.der_encoder;
+	td->xer_decoder    = asn_DEF_IA5String.xer_decoder;
+	td->xer_encoder    = asn_DEF_IA5String.xer_encoder;
+	td->elements       = asn_DEF_IA5String.elements;
+	td->elements_count = asn_DEF_IA5String.elements_count;
+	td->specifics      = asn_DEF_IA5String.specifics;
 }
 
 void
-PER_Visible_free(asn1_TYPE_descriptor_t *td,
+PER_Visible_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	PER_Visible_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-PER_Visible_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+PER_Visible_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	PER_Visible_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-PER_Visible_decode_ber(asn1_TYPE_descriptor_t *td,
+PER_Visible_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	PER_Visible_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-PER_Visible_encode_der(asn1_TYPE_descriptor_t *td,
+PER_Visible_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	PER_Visible_inherit_TYPE_descriptor(td);
@@ -1249,7 +1249,7 @@
 }
 
 asn_enc_rval_t
-PER_Visible_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+PER_Visible_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	PER_Visible_inherit_TYPE_descriptor(td);
@@ -1259,10 +1259,10 @@
 
 /*** <<< STAT-DEFS [PER-Visible] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_PER_Visible_tags[] = {
+static ber_tlv_tag_t asn_DEF_PER_Visible_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_PER_Visible = {
+asn_TYPE_descriptor_t asn_DEF_PER_Visible = {
 	"PER-Visible",
 	PER_Visible_free,
 	PER_Visible_print,
@@ -1272,12 +1272,12 @@
 	0,				/* Not implemented yet */
 	PER_Visible_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_PER_Visible_tags,
-	sizeof(asn1_DEF_PER_Visible_tags)
-		/sizeof(asn1_DEF_PER_Visible_tags[0]), /* 1 */
-	asn1_DEF_PER_Visible_tags,	/* Same as above */
-	sizeof(asn1_DEF_PER_Visible_tags)
-		/sizeof(asn1_DEF_PER_Visible_tags[0]), /* 1 */
+	asn_DEF_PER_Visible_tags,
+	sizeof(asn_DEF_PER_Visible_tags)
+		/sizeof(asn_DEF_PER_Visible_tags[0]), /* 1 */
+	asn_DEF_PER_Visible_tags,	/* Same as above */
+	sizeof(asn_DEF_PER_Visible_tags)
+		/sizeof(asn_DEF_PER_Visible_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -1294,7 +1294,7 @@
 
 /*** <<< FUNC-DECLS [PER-Visible-2] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_PER_Visible_2;
+extern asn_TYPE_descriptor_t asn_DEF_PER_Visible_2;
 asn_struct_free_f PER_Visible_2_free;
 asn_struct_print_f PER_Visible_2_print;
 asn_constr_check_f PER_Visible_2_constraint;
@@ -1321,7 +1321,7 @@
 /*** <<< CODE [PER-Visible-2] >>> ***/
 
 int
-PER_Visible_2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const PER_Visible_t *st = sptr;
 	
@@ -1349,41 +1349,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-PER_Visible_2_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_PER_Visible.free_struct;
-	td->print_struct   = asn1_DEF_PER_Visible.print_struct;
-	td->ber_decoder    = asn1_DEF_PER_Visible.ber_decoder;
-	td->der_encoder    = asn1_DEF_PER_Visible.der_encoder;
-	td->xer_decoder    = asn1_DEF_PER_Visible.xer_decoder;
-	td->xer_encoder    = asn1_DEF_PER_Visible.xer_encoder;
-	td->elements       = asn1_DEF_PER_Visible.elements;
-	td->elements_count = asn1_DEF_PER_Visible.elements_count;
-	td->specifics      = asn1_DEF_PER_Visible.specifics;
+PER_Visible_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_PER_Visible.free_struct;
+	td->print_struct   = asn_DEF_PER_Visible.print_struct;
+	td->ber_decoder    = asn_DEF_PER_Visible.ber_decoder;
+	td->der_encoder    = asn_DEF_PER_Visible.der_encoder;
+	td->xer_decoder    = asn_DEF_PER_Visible.xer_decoder;
+	td->xer_encoder    = asn_DEF_PER_Visible.xer_encoder;
+	td->elements       = asn_DEF_PER_Visible.elements;
+	td->elements_count = asn_DEF_PER_Visible.elements_count;
+	td->specifics      = asn_DEF_PER_Visible.specifics;
 }
 
 void
-PER_Visible_2_free(asn1_TYPE_descriptor_t *td,
+PER_Visible_2_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	PER_Visible_2_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-PER_Visible_2_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+PER_Visible_2_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	PER_Visible_2_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-PER_Visible_2_decode_ber(asn1_TYPE_descriptor_t *td,
+PER_Visible_2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	PER_Visible_2_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-PER_Visible_2_encode_der(asn1_TYPE_descriptor_t *td,
+PER_Visible_2_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	PER_Visible_2_inherit_TYPE_descriptor(td);
@@ -1391,7 +1391,7 @@
 }
 
 asn_enc_rval_t
-PER_Visible_2_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+PER_Visible_2_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	PER_Visible_2_inherit_TYPE_descriptor(td);
@@ -1401,10 +1401,10 @@
 
 /*** <<< STAT-DEFS [PER-Visible-2] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_PER_Visible_2_tags[] = {
+static ber_tlv_tag_t asn_DEF_PER_Visible_2_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_PER_Visible_2 = {
+asn_TYPE_descriptor_t asn_DEF_PER_Visible_2 = {
 	"PER-Visible-2",
 	PER_Visible_2_free,
 	PER_Visible_2_print,
@@ -1414,12 +1414,12 @@
 	0,				/* Not implemented yet */
 	PER_Visible_2_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_PER_Visible_2_tags,
-	sizeof(asn1_DEF_PER_Visible_2_tags)
-		/sizeof(asn1_DEF_PER_Visible_2_tags[0]), /* 1 */
-	asn1_DEF_PER_Visible_2_tags,	/* Same as above */
-	sizeof(asn1_DEF_PER_Visible_2_tags)
-		/sizeof(asn1_DEF_PER_Visible_2_tags[0]), /* 1 */
+	asn_DEF_PER_Visible_2_tags,
+	sizeof(asn_DEF_PER_Visible_2_tags)
+		/sizeof(asn_DEF_PER_Visible_2_tags[0]), /* 1 */
+	asn_DEF_PER_Visible_2_tags,	/* Same as above */
+	sizeof(asn_DEF_PER_Visible_2_tags)
+		/sizeof(asn_DEF_PER_Visible_2_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -1436,7 +1436,7 @@
 
 /*** <<< FUNC-DECLS [Not-PER-Visible-1] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Not_PER_Visible_1;
+extern asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1;
 asn_struct_free_f Not_PER_Visible_1_free;
 asn_struct_print_f Not_PER_Visible_1_print;
 asn_constr_check_f Not_PER_Visible_1_constraint;
@@ -1463,7 +1463,7 @@
 /*** <<< CODE [Not-PER-Visible-1] >>> ***/
 
 int
-Not_PER_Visible_1_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Not_PER_Visible_1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const PER_Visible_t *st = sptr;
 	
@@ -1491,41 +1491,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Not_PER_Visible_1_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_PER_Visible.free_struct;
-	td->print_struct   = asn1_DEF_PER_Visible.print_struct;
-	td->ber_decoder    = asn1_DEF_PER_Visible.ber_decoder;
-	td->der_encoder    = asn1_DEF_PER_Visible.der_encoder;
-	td->xer_decoder    = asn1_DEF_PER_Visible.xer_decoder;
-	td->xer_encoder    = asn1_DEF_PER_Visible.xer_encoder;
-	td->elements       = asn1_DEF_PER_Visible.elements;
-	td->elements_count = asn1_DEF_PER_Visible.elements_count;
-	td->specifics      = asn1_DEF_PER_Visible.specifics;
+Not_PER_Visible_1_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_PER_Visible.free_struct;
+	td->print_struct   = asn_DEF_PER_Visible.print_struct;
+	td->ber_decoder    = asn_DEF_PER_Visible.ber_decoder;
+	td->der_encoder    = asn_DEF_PER_Visible.der_encoder;
+	td->xer_decoder    = asn_DEF_PER_Visible.xer_decoder;
+	td->xer_encoder    = asn_DEF_PER_Visible.xer_encoder;
+	td->elements       = asn_DEF_PER_Visible.elements;
+	td->elements_count = asn_DEF_PER_Visible.elements_count;
+	td->specifics      = asn_DEF_PER_Visible.specifics;
 }
 
 void
-Not_PER_Visible_1_free(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_1_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Not_PER_Visible_1_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Not_PER_Visible_1_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Not_PER_Visible_1_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_1_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Not_PER_Visible_1_decode_ber(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Not_PER_Visible_1_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Not_PER_Visible_1_encode_der(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_1_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_1_inherit_TYPE_descriptor(td);
@@ -1533,7 +1533,7 @@
 }
 
 asn_enc_rval_t
-Not_PER_Visible_1_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Not_PER_Visible_1_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_1_inherit_TYPE_descriptor(td);
@@ -1543,10 +1543,10 @@
 
 /*** <<< STAT-DEFS [Not-PER-Visible-1] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Not_PER_Visible_1_tags[] = {
+static ber_tlv_tag_t asn_DEF_Not_PER_Visible_1_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Not_PER_Visible_1 = {
+asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_1 = {
 	"Not-PER-Visible-1",
 	Not_PER_Visible_1_free,
 	Not_PER_Visible_1_print,
@@ -1556,12 +1556,12 @@
 	0,				/* Not implemented yet */
 	Not_PER_Visible_1_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Not_PER_Visible_1_tags,
-	sizeof(asn1_DEF_Not_PER_Visible_1_tags)
-		/sizeof(asn1_DEF_Not_PER_Visible_1_tags[0]), /* 1 */
-	asn1_DEF_Not_PER_Visible_1_tags,	/* Same as above */
-	sizeof(asn1_DEF_Not_PER_Visible_1_tags)
-		/sizeof(asn1_DEF_Not_PER_Visible_1_tags[0]), /* 1 */
+	asn_DEF_Not_PER_Visible_1_tags,
+	sizeof(asn_DEF_Not_PER_Visible_1_tags)
+		/sizeof(asn_DEF_Not_PER_Visible_1_tags[0]), /* 1 */
+	asn_DEF_Not_PER_Visible_1_tags,	/* Same as above */
+	sizeof(asn_DEF_Not_PER_Visible_1_tags)
+		/sizeof(asn_DEF_Not_PER_Visible_1_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -1578,7 +1578,7 @@
 
 /*** <<< FUNC-DECLS [Not-PER-Visible-2] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Not_PER_Visible_2;
+extern asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2;
 asn_struct_free_f Not_PER_Visible_2_free;
 asn_struct_print_f Not_PER_Visible_2_print;
 asn_constr_check_f Not_PER_Visible_2_constraint;
@@ -1605,7 +1605,7 @@
 /*** <<< CODE [Not-PER-Visible-2] >>> ***/
 
 int
-Not_PER_Visible_2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Not_PER_Visible_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const PER_Visible_t *st = sptr;
 	
@@ -1633,41 +1633,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Not_PER_Visible_2_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_PER_Visible.free_struct;
-	td->print_struct   = asn1_DEF_PER_Visible.print_struct;
-	td->ber_decoder    = asn1_DEF_PER_Visible.ber_decoder;
-	td->der_encoder    = asn1_DEF_PER_Visible.der_encoder;
-	td->xer_decoder    = asn1_DEF_PER_Visible.xer_decoder;
-	td->xer_encoder    = asn1_DEF_PER_Visible.xer_encoder;
-	td->elements       = asn1_DEF_PER_Visible.elements;
-	td->elements_count = asn1_DEF_PER_Visible.elements_count;
-	td->specifics      = asn1_DEF_PER_Visible.specifics;
+Not_PER_Visible_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_PER_Visible.free_struct;
+	td->print_struct   = asn_DEF_PER_Visible.print_struct;
+	td->ber_decoder    = asn_DEF_PER_Visible.ber_decoder;
+	td->der_encoder    = asn_DEF_PER_Visible.der_encoder;
+	td->xer_decoder    = asn_DEF_PER_Visible.xer_decoder;
+	td->xer_encoder    = asn_DEF_PER_Visible.xer_encoder;
+	td->elements       = asn_DEF_PER_Visible.elements;
+	td->elements_count = asn_DEF_PER_Visible.elements_count;
+	td->specifics      = asn_DEF_PER_Visible.specifics;
 }
 
 void
-Not_PER_Visible_2_free(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_2_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Not_PER_Visible_2_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Not_PER_Visible_2_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Not_PER_Visible_2_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_2_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Not_PER_Visible_2_decode_ber(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Not_PER_Visible_2_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Not_PER_Visible_2_encode_der(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_2_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_2_inherit_TYPE_descriptor(td);
@@ -1675,7 +1675,7 @@
 }
 
 asn_enc_rval_t
-Not_PER_Visible_2_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Not_PER_Visible_2_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_2_inherit_TYPE_descriptor(td);
@@ -1685,10 +1685,10 @@
 
 /*** <<< STAT-DEFS [Not-PER-Visible-2] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Not_PER_Visible_2_tags[] = {
+static ber_tlv_tag_t asn_DEF_Not_PER_Visible_2_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Not_PER_Visible_2 = {
+asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_2 = {
 	"Not-PER-Visible-2",
 	Not_PER_Visible_2_free,
 	Not_PER_Visible_2_print,
@@ -1698,12 +1698,12 @@
 	0,				/* Not implemented yet */
 	Not_PER_Visible_2_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Not_PER_Visible_2_tags,
-	sizeof(asn1_DEF_Not_PER_Visible_2_tags)
-		/sizeof(asn1_DEF_Not_PER_Visible_2_tags[0]), /* 1 */
-	asn1_DEF_Not_PER_Visible_2_tags,	/* Same as above */
-	sizeof(asn1_DEF_Not_PER_Visible_2_tags)
-		/sizeof(asn1_DEF_Not_PER_Visible_2_tags[0]), /* 1 */
+	asn_DEF_Not_PER_Visible_2_tags,
+	sizeof(asn_DEF_Not_PER_Visible_2_tags)
+		/sizeof(asn_DEF_Not_PER_Visible_2_tags[0]), /* 1 */
+	asn_DEF_Not_PER_Visible_2_tags,	/* Same as above */
+	sizeof(asn_DEF_Not_PER_Visible_2_tags)
+		/sizeof(asn_DEF_Not_PER_Visible_2_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -1720,7 +1720,7 @@
 
 /*** <<< FUNC-DECLS [Not-PER-Visible-3] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Not_PER_Visible_3;
+extern asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3;
 asn_struct_free_f Not_PER_Visible_3_free;
 asn_struct_print_f Not_PER_Visible_3_print;
 asn_constr_check_f Not_PER_Visible_3_constraint;
@@ -1747,7 +1747,7 @@
 /*** <<< CODE [Not-PER-Visible-3] >>> ***/
 
 int
-Not_PER_Visible_3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Not_PER_Visible_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const PER_Visible_t *st = sptr;
 	
@@ -1775,41 +1775,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Not_PER_Visible_3_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_PER_Visible.free_struct;
-	td->print_struct   = asn1_DEF_PER_Visible.print_struct;
-	td->ber_decoder    = asn1_DEF_PER_Visible.ber_decoder;
-	td->der_encoder    = asn1_DEF_PER_Visible.der_encoder;
-	td->xer_decoder    = asn1_DEF_PER_Visible.xer_decoder;
-	td->xer_encoder    = asn1_DEF_PER_Visible.xer_encoder;
-	td->elements       = asn1_DEF_PER_Visible.elements;
-	td->elements_count = asn1_DEF_PER_Visible.elements_count;
-	td->specifics      = asn1_DEF_PER_Visible.specifics;
+Not_PER_Visible_3_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_PER_Visible.free_struct;
+	td->print_struct   = asn_DEF_PER_Visible.print_struct;
+	td->ber_decoder    = asn_DEF_PER_Visible.ber_decoder;
+	td->der_encoder    = asn_DEF_PER_Visible.der_encoder;
+	td->xer_decoder    = asn_DEF_PER_Visible.xer_decoder;
+	td->xer_encoder    = asn_DEF_PER_Visible.xer_encoder;
+	td->elements       = asn_DEF_PER_Visible.elements;
+	td->elements_count = asn_DEF_PER_Visible.elements_count;
+	td->specifics      = asn_DEF_PER_Visible.specifics;
 }
 
 void
-Not_PER_Visible_3_free(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_3_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Not_PER_Visible_3_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Not_PER_Visible_3_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Not_PER_Visible_3_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_3_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Not_PER_Visible_3_decode_ber(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Not_PER_Visible_3_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Not_PER_Visible_3_encode_der(asn1_TYPE_descriptor_t *td,
+Not_PER_Visible_3_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_3_inherit_TYPE_descriptor(td);
@@ -1817,7 +1817,7 @@
 }
 
 asn_enc_rval_t
-Not_PER_Visible_3_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Not_PER_Visible_3_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Not_PER_Visible_3_inherit_TYPE_descriptor(td);
@@ -1827,10 +1827,10 @@
 
 /*** <<< STAT-DEFS [Not-PER-Visible-3] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Not_PER_Visible_3_tags[] = {
+static ber_tlv_tag_t asn_DEF_Not_PER_Visible_3_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Not_PER_Visible_3 = {
+asn_TYPE_descriptor_t asn_DEF_Not_PER_Visible_3 = {
 	"Not-PER-Visible-3",
 	Not_PER_Visible_3_free,
 	Not_PER_Visible_3_print,
@@ -1840,12 +1840,12 @@
 	0,				/* Not implemented yet */
 	Not_PER_Visible_3_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Not_PER_Visible_3_tags,
-	sizeof(asn1_DEF_Not_PER_Visible_3_tags)
-		/sizeof(asn1_DEF_Not_PER_Visible_3_tags[0]), /* 1 */
-	asn1_DEF_Not_PER_Visible_3_tags,	/* Same as above */
-	sizeof(asn1_DEF_Not_PER_Visible_3_tags)
-		/sizeof(asn1_DEF_Not_PER_Visible_3_tags[0]), /* 1 */
+	asn_DEF_Not_PER_Visible_3_tags,
+	sizeof(asn_DEF_Not_PER_Visible_3_tags)
+		/sizeof(asn_DEF_Not_PER_Visible_3_tags[0]), /* 1 */
+	asn_DEF_Not_PER_Visible_3_tags,	/* Same as above */
+	sizeof(asn_DEF_Not_PER_Visible_3_tags)
+		/sizeof(asn_DEF_Not_PER_Visible_3_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -1862,7 +1862,7 @@
 
 /*** <<< FUNC-DECLS [SIZE-but-not-FROM] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_SIZE_but_not_FROM;
+extern asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM;
 asn_struct_free_f SIZE_but_not_FROM_free;
 asn_struct_print_f SIZE_but_not_FROM_print;
 asn_constr_check_f SIZE_but_not_FROM_constraint;
@@ -1889,7 +1889,7 @@
 /*** <<< CODE [SIZE-but-not-FROM] >>> ***/
 
 int
-SIZE_but_not_FROM_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+SIZE_but_not_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const PER_Visible_t *st = sptr;
 	size_t size;
@@ -1920,41 +1920,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-SIZE_but_not_FROM_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_PER_Visible.free_struct;
-	td->print_struct   = asn1_DEF_PER_Visible.print_struct;
-	td->ber_decoder    = asn1_DEF_PER_Visible.ber_decoder;
-	td->der_encoder    = asn1_DEF_PER_Visible.der_encoder;
-	td->xer_decoder    = asn1_DEF_PER_Visible.xer_decoder;
-	td->xer_encoder    = asn1_DEF_PER_Visible.xer_encoder;
-	td->elements       = asn1_DEF_PER_Visible.elements;
-	td->elements_count = asn1_DEF_PER_Visible.elements_count;
-	td->specifics      = asn1_DEF_PER_Visible.specifics;
+SIZE_but_not_FROM_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_PER_Visible.free_struct;
+	td->print_struct   = asn_DEF_PER_Visible.print_struct;
+	td->ber_decoder    = asn_DEF_PER_Visible.ber_decoder;
+	td->der_encoder    = asn_DEF_PER_Visible.der_encoder;
+	td->xer_decoder    = asn_DEF_PER_Visible.xer_decoder;
+	td->xer_encoder    = asn_DEF_PER_Visible.xer_encoder;
+	td->elements       = asn_DEF_PER_Visible.elements;
+	td->elements_count = asn_DEF_PER_Visible.elements_count;
+	td->specifics      = asn_DEF_PER_Visible.specifics;
 }
 
 void
-SIZE_but_not_FROM_free(asn1_TYPE_descriptor_t *td,
+SIZE_but_not_FROM_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	SIZE_but_not_FROM_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-SIZE_but_not_FROM_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+SIZE_but_not_FROM_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	SIZE_but_not_FROM_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-SIZE_but_not_FROM_decode_ber(asn1_TYPE_descriptor_t *td,
+SIZE_but_not_FROM_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	SIZE_but_not_FROM_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-SIZE_but_not_FROM_encode_der(asn1_TYPE_descriptor_t *td,
+SIZE_but_not_FROM_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	SIZE_but_not_FROM_inherit_TYPE_descriptor(td);
@@ -1962,7 +1962,7 @@
 }
 
 asn_enc_rval_t
-SIZE_but_not_FROM_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+SIZE_but_not_FROM_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	SIZE_but_not_FROM_inherit_TYPE_descriptor(td);
@@ -1972,10 +1972,10 @@
 
 /*** <<< STAT-DEFS [SIZE-but-not-FROM] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_SIZE_but_not_FROM_tags[] = {
+static ber_tlv_tag_t asn_DEF_SIZE_but_not_FROM_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_SIZE_but_not_FROM = {
+asn_TYPE_descriptor_t asn_DEF_SIZE_but_not_FROM = {
 	"SIZE-but-not-FROM",
 	SIZE_but_not_FROM_free,
 	SIZE_but_not_FROM_print,
@@ -1985,12 +1985,12 @@
 	0,				/* Not implemented yet */
 	SIZE_but_not_FROM_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_SIZE_but_not_FROM_tags,
-	sizeof(asn1_DEF_SIZE_but_not_FROM_tags)
-		/sizeof(asn1_DEF_SIZE_but_not_FROM_tags[0]), /* 1 */
-	asn1_DEF_SIZE_but_not_FROM_tags,	/* Same as above */
-	sizeof(asn1_DEF_SIZE_but_not_FROM_tags)
-		/sizeof(asn1_DEF_SIZE_but_not_FROM_tags[0]), /* 1 */
+	asn_DEF_SIZE_but_not_FROM_tags,
+	sizeof(asn_DEF_SIZE_but_not_FROM_tags)
+		/sizeof(asn_DEF_SIZE_but_not_FROM_tags[0]), /* 1 */
+	asn_DEF_SIZE_but_not_FROM_tags,	/* Same as above */
+	sizeof(asn_DEF_SIZE_but_not_FROM_tags)
+		/sizeof(asn_DEF_SIZE_but_not_FROM_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -2007,7 +2007,7 @@
 
 /*** <<< FUNC-DECLS [SIZE-and-FROM] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_SIZE_and_FROM;
+extern asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM;
 asn_struct_free_f SIZE_and_FROM_free;
 asn_struct_print_f SIZE_and_FROM_print;
 asn_constr_check_f SIZE_and_FROM_constraint;
@@ -2034,7 +2034,7 @@
 /*** <<< CODE [SIZE-and-FROM] >>> ***/
 
 int
-SIZE_and_FROM_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+SIZE_and_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const PER_Visible_t *st = sptr;
 	size_t size;
@@ -2065,41 +2065,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-SIZE_and_FROM_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_PER_Visible.free_struct;
-	td->print_struct   = asn1_DEF_PER_Visible.print_struct;
-	td->ber_decoder    = asn1_DEF_PER_Visible.ber_decoder;
-	td->der_encoder    = asn1_DEF_PER_Visible.der_encoder;
-	td->xer_decoder    = asn1_DEF_PER_Visible.xer_decoder;
-	td->xer_encoder    = asn1_DEF_PER_Visible.xer_encoder;
-	td->elements       = asn1_DEF_PER_Visible.elements;
-	td->elements_count = asn1_DEF_PER_Visible.elements_count;
-	td->specifics      = asn1_DEF_PER_Visible.specifics;
+SIZE_and_FROM_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_PER_Visible.free_struct;
+	td->print_struct   = asn_DEF_PER_Visible.print_struct;
+	td->ber_decoder    = asn_DEF_PER_Visible.ber_decoder;
+	td->der_encoder    = asn_DEF_PER_Visible.der_encoder;
+	td->xer_decoder    = asn_DEF_PER_Visible.xer_decoder;
+	td->xer_encoder    = asn_DEF_PER_Visible.xer_encoder;
+	td->elements       = asn_DEF_PER_Visible.elements;
+	td->elements_count = asn_DEF_PER_Visible.elements_count;
+	td->specifics      = asn_DEF_PER_Visible.specifics;
 }
 
 void
-SIZE_and_FROM_free(asn1_TYPE_descriptor_t *td,
+SIZE_and_FROM_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	SIZE_and_FROM_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-SIZE_and_FROM_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+SIZE_and_FROM_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	SIZE_and_FROM_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-SIZE_and_FROM_decode_ber(asn1_TYPE_descriptor_t *td,
+SIZE_and_FROM_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	SIZE_and_FROM_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-SIZE_and_FROM_encode_der(asn1_TYPE_descriptor_t *td,
+SIZE_and_FROM_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	SIZE_and_FROM_inherit_TYPE_descriptor(td);
@@ -2107,7 +2107,7 @@
 }
 
 asn_enc_rval_t
-SIZE_and_FROM_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+SIZE_and_FROM_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	SIZE_and_FROM_inherit_TYPE_descriptor(td);
@@ -2117,10 +2117,10 @@
 
 /*** <<< STAT-DEFS [SIZE-and-FROM] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_SIZE_and_FROM_tags[] = {
+static ber_tlv_tag_t asn_DEF_SIZE_and_FROM_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_SIZE_and_FROM = {
+asn_TYPE_descriptor_t asn_DEF_SIZE_and_FROM = {
 	"SIZE-and-FROM",
 	SIZE_and_FROM_free,
 	SIZE_and_FROM_print,
@@ -2130,12 +2130,12 @@
 	0,				/* Not implemented yet */
 	SIZE_and_FROM_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_SIZE_and_FROM_tags,
-	sizeof(asn1_DEF_SIZE_and_FROM_tags)
-		/sizeof(asn1_DEF_SIZE_and_FROM_tags[0]), /* 1 */
-	asn1_DEF_SIZE_and_FROM_tags,	/* Same as above */
-	sizeof(asn1_DEF_SIZE_and_FROM_tags)
-		/sizeof(asn1_DEF_SIZE_and_FROM_tags[0]), /* 1 */
+	asn_DEF_SIZE_and_FROM_tags,
+	sizeof(asn_DEF_SIZE_and_FROM_tags)
+		/sizeof(asn_DEF_SIZE_and_FROM_tags[0]), /* 1 */
+	asn_DEF_SIZE_and_FROM_tags,	/* Same as above */
+	sizeof(asn_DEF_SIZE_and_FROM_tags)
+		/sizeof(asn_DEF_SIZE_and_FROM_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -2152,7 +2152,7 @@
 
 /*** <<< FUNC-DECLS [Neither-SIZE-nor-FROM] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Neither_SIZE_nor_FROM;
+extern asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM;
 asn_struct_free_f Neither_SIZE_nor_FROM_free;
 asn_struct_print_f Neither_SIZE_nor_FROM_print;
 asn_constr_check_f Neither_SIZE_nor_FROM_constraint;
@@ -2179,7 +2179,7 @@
 /*** <<< CODE [Neither-SIZE-nor-FROM] >>> ***/
 
 int
-Neither_SIZE_nor_FROM_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Neither_SIZE_nor_FROM_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const PER_Visible_t *st = sptr;
 	
@@ -2207,41 +2207,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_PER_Visible.free_struct;
-	td->print_struct   = asn1_DEF_PER_Visible.print_struct;
-	td->ber_decoder    = asn1_DEF_PER_Visible.ber_decoder;
-	td->der_encoder    = asn1_DEF_PER_Visible.der_encoder;
-	td->xer_decoder    = asn1_DEF_PER_Visible.xer_decoder;
-	td->xer_encoder    = asn1_DEF_PER_Visible.xer_encoder;
-	td->elements       = asn1_DEF_PER_Visible.elements;
-	td->elements_count = asn1_DEF_PER_Visible.elements_count;
-	td->specifics      = asn1_DEF_PER_Visible.specifics;
+Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_PER_Visible.free_struct;
+	td->print_struct   = asn_DEF_PER_Visible.print_struct;
+	td->ber_decoder    = asn_DEF_PER_Visible.ber_decoder;
+	td->der_encoder    = asn_DEF_PER_Visible.der_encoder;
+	td->xer_decoder    = asn_DEF_PER_Visible.xer_decoder;
+	td->xer_encoder    = asn_DEF_PER_Visible.xer_encoder;
+	td->elements       = asn_DEF_PER_Visible.elements;
+	td->elements_count = asn_DEF_PER_Visible.elements_count;
+	td->specifics      = asn_DEF_PER_Visible.specifics;
 }
 
 void
-Neither_SIZE_nor_FROM_free(asn1_TYPE_descriptor_t *td,
+Neither_SIZE_nor_FROM_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Neither_SIZE_nor_FROM_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Neither_SIZE_nor_FROM_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Neither_SIZE_nor_FROM_decode_ber(asn1_TYPE_descriptor_t *td,
+Neither_SIZE_nor_FROM_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Neither_SIZE_nor_FROM_encode_der(asn1_TYPE_descriptor_t *td,
+Neither_SIZE_nor_FROM_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(td);
@@ -2249,7 +2249,7 @@
 }
 
 asn_enc_rval_t
-Neither_SIZE_nor_FROM_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Neither_SIZE_nor_FROM_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Neither_SIZE_nor_FROM_inherit_TYPE_descriptor(td);
@@ -2259,10 +2259,10 @@
 
 /*** <<< STAT-DEFS [Neither-SIZE-nor-FROM] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Neither_SIZE_nor_FROM_tags[] = {
+static ber_tlv_tag_t asn_DEF_Neither_SIZE_nor_FROM_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Neither_SIZE_nor_FROM = {
+asn_TYPE_descriptor_t asn_DEF_Neither_SIZE_nor_FROM = {
 	"Neither-SIZE-nor-FROM",
 	Neither_SIZE_nor_FROM_free,
 	Neither_SIZE_nor_FROM_print,
@@ -2272,12 +2272,12 @@
 	0,				/* Not implemented yet */
 	Neither_SIZE_nor_FROM_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Neither_SIZE_nor_FROM_tags,
-	sizeof(asn1_DEF_Neither_SIZE_nor_FROM_tags)
-		/sizeof(asn1_DEF_Neither_SIZE_nor_FROM_tags[0]), /* 1 */
-	asn1_DEF_Neither_SIZE_nor_FROM_tags,	/* Same as above */
-	sizeof(asn1_DEF_Neither_SIZE_nor_FROM_tags)
-		/sizeof(asn1_DEF_Neither_SIZE_nor_FROM_tags[0]), /* 1 */
+	asn_DEF_Neither_SIZE_nor_FROM_tags,
+	sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags)
+		/sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags[0]), /* 1 */
+	asn_DEF_Neither_SIZE_nor_FROM_tags,	/* Same as above */
+	sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags)
+		/sizeof(asn_DEF_Neither_SIZE_nor_FROM_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -2294,7 +2294,7 @@
 
 /*** <<< FUNC-DECLS [Utf8-3] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Utf8_3;
+extern asn_TYPE_descriptor_t asn_DEF_Utf8_3;
 asn_struct_free_f Utf8_3_free;
 asn_struct_print_f Utf8_3_print;
 asn_constr_check_f Utf8_3_constraint;
@@ -2334,7 +2334,7 @@
 /*** <<< CODE [Utf8-3] >>> ***/
 
 int
-Utf8_3_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Utf8_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Utf8_2_t *st = sptr;
 	size_t size;
@@ -2366,41 +2366,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Utf8_3_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Utf8_2.free_struct;
-	td->print_struct   = asn1_DEF_Utf8_2.print_struct;
-	td->ber_decoder    = asn1_DEF_Utf8_2.ber_decoder;
-	td->der_encoder    = asn1_DEF_Utf8_2.der_encoder;
-	td->xer_decoder    = asn1_DEF_Utf8_2.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Utf8_2.xer_encoder;
-	td->elements       = asn1_DEF_Utf8_2.elements;
-	td->elements_count = asn1_DEF_Utf8_2.elements_count;
-	td->specifics      = asn1_DEF_Utf8_2.specifics;
+Utf8_3_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Utf8_2.free_struct;
+	td->print_struct   = asn_DEF_Utf8_2.print_struct;
+	td->ber_decoder    = asn_DEF_Utf8_2.ber_decoder;
+	td->der_encoder    = asn_DEF_Utf8_2.der_encoder;
+	td->xer_decoder    = asn_DEF_Utf8_2.xer_decoder;
+	td->xer_encoder    = asn_DEF_Utf8_2.xer_encoder;
+	td->elements       = asn_DEF_Utf8_2.elements;
+	td->elements_count = asn_DEF_Utf8_2.elements_count;
+	td->specifics      = asn_DEF_Utf8_2.specifics;
 }
 
 void
-Utf8_3_free(asn1_TYPE_descriptor_t *td,
+Utf8_3_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Utf8_3_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Utf8_3_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Utf8_3_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Utf8_3_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Utf8_3_decode_ber(asn1_TYPE_descriptor_t *td,
+Utf8_3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Utf8_3_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Utf8_3_encode_der(asn1_TYPE_descriptor_t *td,
+Utf8_3_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Utf8_3_inherit_TYPE_descriptor(td);
@@ -2408,7 +2408,7 @@
 }
 
 asn_enc_rval_t
-Utf8_3_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Utf8_3_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Utf8_3_inherit_TYPE_descriptor(td);
@@ -2418,10 +2418,10 @@
 
 /*** <<< STAT-DEFS [Utf8-3] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Utf8_3_tags[] = {
+static ber_tlv_tag_t asn_DEF_Utf8_3_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (12 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Utf8_3 = {
+asn_TYPE_descriptor_t asn_DEF_Utf8_3 = {
 	"Utf8-3",
 	Utf8_3_free,
 	Utf8_3_print,
@@ -2431,12 +2431,12 @@
 	0,				/* Not implemented yet */
 	Utf8_3_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Utf8_3_tags,
-	sizeof(asn1_DEF_Utf8_3_tags)
-		/sizeof(asn1_DEF_Utf8_3_tags[0]), /* 1 */
-	asn1_DEF_Utf8_3_tags,	/* Same as above */
-	sizeof(asn1_DEF_Utf8_3_tags)
-		/sizeof(asn1_DEF_Utf8_3_tags[0]), /* 1 */
+	asn_DEF_Utf8_3_tags,
+	sizeof(asn_DEF_Utf8_3_tags)
+		/sizeof(asn_DEF_Utf8_3_tags[0]), /* 1 */
+	asn_DEF_Utf8_3_tags,	/* Same as above */
+	sizeof(asn_DEF_Utf8_3_tags)
+		/sizeof(asn_DEF_Utf8_3_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -2453,7 +2453,7 @@
 
 /*** <<< FUNC-DECLS [Utf8-2] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Utf8_2;
+extern asn_TYPE_descriptor_t asn_DEF_Utf8_2;
 asn_struct_free_f Utf8_2_free;
 asn_struct_print_f Utf8_2_print;
 asn_constr_check_f Utf8_2_constraint;
@@ -2464,7 +2464,7 @@
 /*** <<< CODE [Utf8-2] >>> ***/
 
 int
-Utf8_2_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Utf8_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const Utf8_1_t *st = sptr;
 	size_t size;
@@ -2495,41 +2495,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Utf8_2_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_Utf8_1.free_struct;
-	td->print_struct   = asn1_DEF_Utf8_1.print_struct;
-	td->ber_decoder    = asn1_DEF_Utf8_1.ber_decoder;
-	td->der_encoder    = asn1_DEF_Utf8_1.der_encoder;
-	td->xer_decoder    = asn1_DEF_Utf8_1.xer_decoder;
-	td->xer_encoder    = asn1_DEF_Utf8_1.xer_encoder;
-	td->elements       = asn1_DEF_Utf8_1.elements;
-	td->elements_count = asn1_DEF_Utf8_1.elements_count;
-	td->specifics      = asn1_DEF_Utf8_1.specifics;
+Utf8_2_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_Utf8_1.free_struct;
+	td->print_struct   = asn_DEF_Utf8_1.print_struct;
+	td->ber_decoder    = asn_DEF_Utf8_1.ber_decoder;
+	td->der_encoder    = asn_DEF_Utf8_1.der_encoder;
+	td->xer_decoder    = asn_DEF_Utf8_1.xer_decoder;
+	td->xer_encoder    = asn_DEF_Utf8_1.xer_encoder;
+	td->elements       = asn_DEF_Utf8_1.elements;
+	td->elements_count = asn_DEF_Utf8_1.elements_count;
+	td->specifics      = asn_DEF_Utf8_1.specifics;
 }
 
 void
-Utf8_2_free(asn1_TYPE_descriptor_t *td,
+Utf8_2_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Utf8_2_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Utf8_2_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Utf8_2_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Utf8_2_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Utf8_2_decode_ber(asn1_TYPE_descriptor_t *td,
+Utf8_2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Utf8_2_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Utf8_2_encode_der(asn1_TYPE_descriptor_t *td,
+Utf8_2_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Utf8_2_inherit_TYPE_descriptor(td);
@@ -2537,7 +2537,7 @@
 }
 
 asn_enc_rval_t
-Utf8_2_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Utf8_2_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Utf8_2_inherit_TYPE_descriptor(td);
@@ -2547,10 +2547,10 @@
 
 /*** <<< STAT-DEFS [Utf8-2] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Utf8_2_tags[] = {
+static ber_tlv_tag_t asn_DEF_Utf8_2_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (12 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Utf8_2 = {
+asn_TYPE_descriptor_t asn_DEF_Utf8_2 = {
 	"Utf8-2",
 	Utf8_2_free,
 	Utf8_2_print,
@@ -2560,12 +2560,12 @@
 	0,				/* Not implemented yet */
 	Utf8_2_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Utf8_2_tags,
-	sizeof(asn1_DEF_Utf8_2_tags)
-		/sizeof(asn1_DEF_Utf8_2_tags[0]), /* 1 */
-	asn1_DEF_Utf8_2_tags,	/* Same as above */
-	sizeof(asn1_DEF_Utf8_2_tags)
-		/sizeof(asn1_DEF_Utf8_2_tags[0]), /* 1 */
+	asn_DEF_Utf8_2_tags,
+	sizeof(asn_DEF_Utf8_2_tags)
+		/sizeof(asn_DEF_Utf8_2_tags[0]), /* 1 */
+	asn_DEF_Utf8_2_tags,	/* Same as above */
+	sizeof(asn_DEF_Utf8_2_tags)
+		/sizeof(asn_DEF_Utf8_2_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
@@ -2583,7 +2583,7 @@
 /*** <<< FUNC-DECLS [Utf8-1] >>> ***/
 
 /* This type is equivalent to UTF8String */
-#define	asn1_DEF_Utf8_1	asn1_DEF_UTF8String
+#define	asn_DEF_Utf8_1	asn_DEF_UTF8String
 
 /*** <<< CODE [Utf8-1] >>> ***/
 
@@ -2602,7 +2602,7 @@
 /*** <<< FUNC-DECLS [VisibleIdentifier] >>> ***/
 
 /* This type is equivalent to Identifier */
-#define	asn1_DEF_VisibleIdentifier	asn1_DEF_Identifier
+#define	asn_DEF_VisibleIdentifier	asn_DEF_Identifier
 
 /*** <<< CODE [VisibleIdentifier] >>> ***/
 
@@ -2620,7 +2620,7 @@
 
 /*** <<< FUNC-DECLS [Identifier] >>> ***/
 
-extern asn1_TYPE_descriptor_t asn1_DEF_Identifier;
+extern asn_TYPE_descriptor_t asn_DEF_Identifier;
 asn_struct_free_f Identifier_free;
 asn_struct_print_f Identifier_print;
 asn_constr_check_f Identifier_constraint;
@@ -2659,7 +2659,7 @@
 /*** <<< CODE [Identifier] >>> ***/
 
 int
-Identifier_constraint(asn1_TYPE_descriptor_t *td, const void *sptr,
+Identifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
 			asn_app_consume_bytes_f *app_errlog, void *app_key) {
 	const VisibleString_t *st = sptr;
 	size_t size;
@@ -2690,41 +2690,41 @@
  * so here we adjust the DEF accordingly.
  */
 static void
-Identifier_inherit_TYPE_descriptor(asn1_TYPE_descriptor_t *td) {
-	td->free_struct    = asn1_DEF_VisibleString.free_struct;
-	td->print_struct   = asn1_DEF_VisibleString.print_struct;
-	td->ber_decoder    = asn1_DEF_VisibleString.ber_decoder;
-	td->der_encoder    = asn1_DEF_VisibleString.der_encoder;
-	td->xer_decoder    = asn1_DEF_VisibleString.xer_decoder;
-	td->xer_encoder    = asn1_DEF_VisibleString.xer_encoder;
-	td->elements       = asn1_DEF_VisibleString.elements;
-	td->elements_count = asn1_DEF_VisibleString.elements_count;
-	td->specifics      = asn1_DEF_VisibleString.specifics;
+Identifier_inherit_TYPE_descriptor(asn_TYPE_descriptor_t *td) {
+	td->free_struct    = asn_DEF_VisibleString.free_struct;
+	td->print_struct   = asn_DEF_VisibleString.print_struct;
+	td->ber_decoder    = asn_DEF_VisibleString.ber_decoder;
+	td->der_encoder    = asn_DEF_VisibleString.der_encoder;
+	td->xer_decoder    = asn_DEF_VisibleString.xer_decoder;
+	td->xer_encoder    = asn_DEF_VisibleString.xer_encoder;
+	td->elements       = asn_DEF_VisibleString.elements;
+	td->elements_count = asn_DEF_VisibleString.elements_count;
+	td->specifics      = asn_DEF_VisibleString.specifics;
 }
 
 void
-Identifier_free(asn1_TYPE_descriptor_t *td,
+Identifier_free(asn_TYPE_descriptor_t *td,
 		void *struct_ptr, int contents_only) {
 	Identifier_inherit_TYPE_descriptor(td);
 	td->free_struct(td, struct_ptr, contents_only);
 }
 
 int
-Identifier_print(asn1_TYPE_descriptor_t *td, const void *struct_ptr,
+Identifier_print(asn_TYPE_descriptor_t *td, const void *struct_ptr,
 		int ilevel, asn_app_consume_bytes_f *cb, void *app_key) {
 	Identifier_inherit_TYPE_descriptor(td);
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
 ber_dec_rval_t
-Identifier_decode_ber(asn1_TYPE_descriptor_t *td,
+Identifier_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	Identifier_inherit_TYPE_descriptor(td);
-	return td->ber_decoder(td, structure, bufptr, size, tag_mode);
+	return td->ber_decoder(opt_codec_ctx, td, structure, bufptr, size, tag_mode);
 }
 
 asn_enc_rval_t
-Identifier_encode_der(asn1_TYPE_descriptor_t *td,
+Identifier_encode_der(asn_TYPE_descriptor_t *td,
 		void *structure, int tag_mode, ber_tlv_tag_t tag,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Identifier_inherit_TYPE_descriptor(td);
@@ -2732,7 +2732,7 @@
 }
 
 asn_enc_rval_t
-Identifier_encode_xer(asn1_TYPE_descriptor_t *td, void *structure,
+Identifier_encode_xer(asn_TYPE_descriptor_t *td, void *structure,
 		int ilevel, enum xer_encoder_flags_e flags,
 		asn_app_consume_bytes_f *cb, void *app_key) {
 	Identifier_inherit_TYPE_descriptor(td);
@@ -2742,10 +2742,10 @@
 
 /*** <<< STAT-DEFS [Identifier] >>> ***/
 
-static ber_tlv_tag_t asn1_DEF_Identifier_tags[] = {
+static ber_tlv_tag_t asn_DEF_Identifier_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (26 << 2))
 };
-asn1_TYPE_descriptor_t asn1_DEF_Identifier = {
+asn_TYPE_descriptor_t asn_DEF_Identifier = {
 	"Identifier",
 	Identifier_free,
 	Identifier_print,
@@ -2755,12 +2755,12 @@
 	0,				/* Not implemented yet */
 	Identifier_encode_xer,
 	0,	/* Use generic outmost tag fetcher */
-	asn1_DEF_Identifier_tags,
-	sizeof(asn1_DEF_Identifier_tags)
-		/sizeof(asn1_DEF_Identifier_tags[0]), /* 1 */
-	asn1_DEF_Identifier_tags,	/* Same as above */
-	sizeof(asn1_DEF_Identifier_tags)
-		/sizeof(asn1_DEF_Identifier_tags[0]), /* 1 */
+	asn_DEF_Identifier_tags,
+	sizeof(asn_DEF_Identifier_tags)
+		/sizeof(asn_DEF_Identifier_tags[0]), /* 1 */
+	asn_DEF_Identifier_tags,	/* Same as above */
+	sizeof(asn_DEF_Identifier_tags)
+		/sizeof(asn_DEF_Identifier_tags[0]), /* 1 */
 	0, 0,	/* No members */
 	0	/* No specifics */
 };