asn1_* renamed into asn_*

diff --git a/skeletons/der_encoder.h b/skeletons/der_encoder.h
index 5a29613..62aafa7 100644
--- a/skeletons/der_encoder.h
+++ b/skeletons/der_encoder.h
@@ -7,12 +7,12 @@
 
 #include <asn_application.h>
 
-struct asn1_TYPE_descriptor_s;	/* Forward declaration */
+struct asn_TYPE_descriptor_s;	/* Forward declaration */
 
 /*
  * The DER encoder of any type. May be invoked by the application.
  */
-asn_enc_rval_t der_encode(struct asn1_TYPE_descriptor_s *type_descriptor,
+asn_enc_rval_t der_encode(struct asn_TYPE_descriptor_s *type_descriptor,
 		void *struct_ptr,	/* Structure to be encoded */
 		asn_app_consume_bytes_f *consume_bytes_cb,
 		void *app_key		/* Arbitrary callback argument */
@@ -22,7 +22,7 @@
  * Type of the generic DER encoder.
  */
 typedef asn_enc_rval_t (der_type_encoder_f)(
-		struct asn1_TYPE_descriptor_s *type_descriptor,
+		struct asn_TYPE_descriptor_s *type_descriptor,
 		void *struct_ptr,	/* Structure to be encoded */
 		int tag_mode,		/* {-1,0,1}: IMPLICIT, no, EXPLICIT */
 		ber_tlv_tag_t tag,
@@ -39,7 +39,7 @@
  * Write out leading TL[v] sequence according to the type definition.
  */
 ssize_t der_write_tags(
-		struct asn1_TYPE_descriptor_s *type_descriptor,
+		struct asn_TYPE_descriptor_s *type_descriptor,
 		size_t struct_length,
 		int tag_mode,		/* {-1,0,1}: IMPLICIT, no, EXPLICIT */
 		int last_tag_form,	/* {0,!0}: prim, constructed */