diff --git a/tests/95-choice-per-order-OK.asn1.-Pgen-PER b/tests/95-choice-per-order-OK.asn1.-Pgen-PER
index b542976..1c31d7d 100644
--- a/tests/95-choice-per-order-OK.asn1.-Pgen-PER
+++ b/tests/95-choice-per-order-OK.asn1.-Pgen-PER
@@ -58,12 +58,12 @@
 
 /*** <<< CTDEFS [Choice] >>> ***/
 
-static asn_per_constraints_t asn_PER_ch_constr_4 = {
+static asn_per_constraints_t asn_PER_type_ch_constr_4 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_Choice_constr_1 = {
+static asn_per_constraints_t asn_PER_type_Choice_constr_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  2 }	/* (0..2,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -124,7 +124,7 @@
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_ch_constr_4,
+	&asn_PER_type_ch_constr_4,
 	asn_MBR_ch_4,
 	2,	/* Elements count */
 	&asn_SPC_ch_specs_4	/* Additional specs */
@@ -154,7 +154,7 @@
 		.tag_mode = 0,
 		.type = &asn_DEF_ch_4,
 		.memb_constraints = 0,	/* Defer constraints checking to the member type */
-		.per_constraints = &asn_PER_ch_constr_4,
+		.per_constraints = &asn_PER_memb_ch_constr_4,
 		.default_value = 0,
 		.name = "ch"
 		},
@@ -203,7 +203,7 @@
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_Choice_constr_1,
+	&asn_PER_type_Choice_constr_1,
 	asn_MBR_Choice_1,
 	4,	/* Elements count */
 	&asn_SPC_Choice_specs_1	/* Additional specs */
@@ -243,7 +243,7 @@
 
 /*** <<< CTDEFS [Choice2] >>> ***/
 
-static asn_per_constraints_t asn_PER_Choice2_constr_1 = {
+static asn_per_constraints_t asn_PER_type_Choice2_constr_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -302,7 +302,7 @@
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_Choice2_constr_1,
+	&asn_PER_type_Choice2_constr_1,
 	asn_MBR_Choice2_1,
 	2,	/* Elements count */
 	&asn_SPC_Choice2_specs_1	/* Additional specs */