diff --git a/skeletons/T61String.c b/skeletons/T61String.c
index 14a86b9..41835c4 100644
--- a/skeletons/T61String.c
+++ b/skeletons/T61String.c
@@ -8,11 +8,11 @@
 /*
  * T61String basic type description.
  */
-static ber_tlv_tag_t asn1_DEF_T61String_tags[] = {
+static ber_tlv_tag_t asn_DEF_T61String_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (20 << 2)),	/* [UNIVERSAL 20] IMPLICIT ...*/
 	(ASN_TAG_CLASS_UNIVERSAL | (4 << 2))	/* ... OCTET STRING */
 };
-asn1_TYPE_descriptor_t asn1_DEF_T61String = {
+asn_TYPE_descriptor_t asn_DEF_T61String = {
 	"T61String",
 	OCTET_STRING_free,
 	OCTET_STRING_print,         /* non-ascii string */
@@ -22,12 +22,12 @@
 	0,				/* Not implemented yet */
 	OCTET_STRING_encode_xer,    /* Implemented in terms of OCTET STRING */
 	0, /* Use generic outmost tag fetcher */
-	asn1_DEF_T61String_tags,
-	sizeof(asn1_DEF_T61String_tags)
-	  / sizeof(asn1_DEF_T61String_tags[0]) - 1,
-	asn1_DEF_T61String_tags,
-	sizeof(asn1_DEF_T61String_tags)
-	  / sizeof(asn1_DEF_T61String_tags[0]),
+	asn_DEF_T61String_tags,
+	sizeof(asn_DEF_T61String_tags)
+	  / sizeof(asn_DEF_T61String_tags[0]) - 1,
+	asn_DEF_T61String_tags,
+	sizeof(asn_DEF_T61String_tags)
+	  / sizeof(asn_DEF_T61String_tags[0]),
 	0, 0,	/* No members */
 	0	/* No specifics */
 };