diff --git a/tests/65-multi-tag-OK.asn1.-Pfnative-types b/tests/65-multi-tag-OK.asn1.-Pfnative-types
index faed7c6..796962a 100644
--- a/tests/65-multi-tag-OK.asn1.-Pfnative-types
+++ b/tests/65-multi-tag-OK.asn1.-Pfnative-types
@@ -59,7 +59,7 @@
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
-ber_dec_rval_t
+asn_dec_rval_t
 T1_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	T1_inherit_TYPE_descriptor(td);
@@ -101,6 +101,7 @@
 };
 asn_TYPE_descriptor_t asn_DEF_T1 = {
 	"T1",
+	"T1",
 	T1_free,
 	T1_print,
 	T1_constraint,
@@ -180,7 +181,7 @@
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
-ber_dec_rval_t
+asn_dec_rval_t
 T2_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	T2_inherit_TYPE_descriptor(td);
@@ -220,6 +221,7 @@
 };
 asn_TYPE_descriptor_t asn_DEF_T2 = {
 	"T2",
+	"T2",
 	T2_free,
 	T2_print,
 	T2_constraint,
@@ -299,7 +301,7 @@
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
-ber_dec_rval_t
+asn_dec_rval_t
 T3_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	T3_inherit_TYPE_descriptor(td);
@@ -337,6 +339,7 @@
 };
 asn_TYPE_descriptor_t asn_DEF_T3 = {
 	"T3",
+	"T3",
 	T3_free,
 	T3_print,
 	T3_constraint,
@@ -416,7 +419,7 @@
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
-ber_dec_rval_t
+asn_dec_rval_t
 T4_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	T4_inherit_TYPE_descriptor(td);
@@ -449,6 +452,7 @@
 };
 asn_TYPE_descriptor_t asn_DEF_T4 = {
 	"T4",
+	"T4",
 	T4_free,
 	T4_print,
 	T4_constraint,
@@ -528,7 +532,7 @@
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
-ber_dec_rval_t
+asn_dec_rval_t
 T5_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	T5_inherit_TYPE_descriptor(td);
@@ -560,6 +564,7 @@
 };
 asn_TYPE_descriptor_t asn_DEF_T5 = {
 	"T5",
+	"T5",
 	T5_free,
 	T5_print,
 	T5_constraint,
@@ -658,7 +663,7 @@
 	return td->print_struct(td, struct_ptr, ilevel, cb, app_key);
 }
 
-ber_dec_rval_t
+asn_dec_rval_t
 T_decode_ber(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td,
 		void **structure, void *bufptr, size_t size, int tag_mode) {
 	T_inherit_TYPE_descriptor(td);
@@ -691,6 +696,7 @@
 };
 asn_TYPE_descriptor_t asn_DEF_T = {
 	"T",
+	"T",
 	T_free,
 	T_print,
 	T_constraint,
@@ -776,6 +782,7 @@
 };
 asn_TYPE_descriptor_t asn_DEF_Ts = {
 	"Ts",
+	"Ts",
 	SEQUENCE_free,
 	SEQUENCE_print,
 	SEQUENCE_constraint,