diff --git a/libasn1compiler/asn1c_save.c b/libasn1compiler/asn1c_save.c
index 226c2a8..d54777f 100644
--- a/libasn1compiler/asn1c_save.c
+++ b/libasn1compiler/asn1c_save.c
@@ -215,7 +215,7 @@
 	generate_preamble(arg, fp_c, argc, optc, argv);
 	generate_preamble(arg, fp_h, argc, optc, argv);
 
-	header_id = asn1c_make_identifier(0, expr->Identifier, NULL);
+	header_id = asn1c_make_identifier(0, expr, NULL);
 	fprintf(fp_h,
 		"#ifndef\t_%s_H_\n"
 		"#define\t_%s_H_\n"
@@ -477,8 +477,7 @@
 				continue;
 			fprintf(fp, "extern struct asn_TYPE_descriptor_s "
 				"asn_DEF_%s;\n",
-				asn1c_make_identifier(0, arg->expr->Identifier,
-					NULL));
+				asn1c_make_identifier(0, arg->expr, NULL));
 		}
 	}
 
@@ -496,8 +495,7 @@
 				arg->expr->module->ModuleName,
 				arg->expr->module->source_file_name);
 			fprintf(fp, "\t&asn_DEF_%s,\t\n",
-				asn1c_make_identifier(0, arg->expr->Identifier,
-					NULL));
+				asn1c_make_identifier(0, arg->expr, NULL));
 		}
 	}