diff --git a/skeletons/ber_tlv_tag.c b/skeletons/ber_tlv_tag.c
index d7630c4dd59d7430afbe6d179e63d73e21d84327..d69ba31b0290438a524026be2eac11445f704f8c 100644
--- a/skeletons/ber_tlv_tag.c
+++ b/skeletons/ber_tlv_tag.c
@@ -100,7 +100,7 @@ ber_tlv_tag_string(ber_tlv_tag_t tag) {
 
 
 ssize_t
-der_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufp, size_t size) {
+ber_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufp, size_t size) {
 	int tclass = BER_TAG_CLASS(tag);
 	ber_tlv_tag_t tval = BER_TAG_VALUE(tag);
 	uint8_t *buf = (uint8_t *)bufp;
diff --git a/skeletons/ber_tlv_tag.h b/skeletons/ber_tlv_tag.h
index 5041970290ff439d3c33e4d9ab1b0ba3300dabce..22152ffdcfed96ab706fb21fba5be9fedc7698d3 100644
--- a/skeletons/ber_tlv_tag.h
+++ b/skeletons/ber_tlv_tag.h
@@ -42,11 +42,11 @@ char *ber_tlv_tag_string(ber_tlv_tag_t tag);
 ssize_t ber_fetch_tag(void *bufptr, size_t size, ber_tlv_tag_t *tag_r);
 
 /*
- * This function serializes the tag (T from TLV) in DER format.
+ * This function serializes the tag (T from TLV) in BER format.
  * It always return number of bytes necessary to represent the tag,
  * it is a caller's responsibility to check the return value
  * against the supplied buffer's size.
  */
-ssize_t der_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufptr, size_t size);
+ssize_t ber_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufptr, size_t size);
 
 #endif	/* _BER_TLV_TAG_H_ */
diff --git a/skeletons/der_encoder.c b/skeletons/der_encoder.c
index ddd0bf86b8f92204cf393dc11b2ff1c94546ed08..fbdccec4d3f22310eb7aa414b87569b883e7d812 100644
--- a/skeletons/der_encoder.c
+++ b/skeletons/der_encoder.c
@@ -134,7 +134,7 @@ der_write_TL(ber_tlv_tag_t tag, ber_tlv_len_t len,
 	ssize_t tmp;
 
 	/* Serialize tag (T from TLV) into possibly zero-length buffer */
-	tmp = der_tlv_tag_serialize(tag, buf, buf_size);
+	tmp = ber_tlv_tag_serialize(tag, buf, buf_size);
 	if(tmp == -1 || tmp > (ssize_t)sizeof(buf)) return -1;
 	size += tmp;