diff --git a/lib/asn1/asn1_print.c b/lib/asn1/asn1_print.c
index 28d10dc40..8b9f0a8a4 100644
--- a/lib/asn1/asn1_print.c
+++ b/lib/asn1/asn1_print.c
@@ -199,7 +199,7 @@ loop (unsigned char *buf, size_t len, int indent)
 		if (ret)
 		    errx (1, "der_get_oid: %s", error_message (ret));
 		ret = der_print_heim_oid(&o, '.', &p);
-		free_oid(&o);
+		der_free_oid(&o);
 		if (ret)
 		    errx (1, "der_print_heim_oid: %s", error_message (ret));
 		printf("%s\n", p);
diff --git a/lib/asn1/der_copy.c b/lib/asn1/der_copy.c
index 3a39da378..10f945fda 100644
--- a/lib/asn1/der_copy.c
+++ b/lib/asn1/der_copy.c
@@ -48,21 +48,21 @@ der_copy_general_string (const heim_general_string *from,
 int
 der_copy_utf8string (const heim_utf8_string *from, heim_utf8_string *to)
 {
-    return copy_general_string(from, to);
+    return der_copy_general_string(from, to);
 }
 
 int
 der_copy_printable_string (const heim_printable_string *from, 
 		       heim_printable_string *to)
 {
-    return copy_general_string(from, to);
+    return der_copy_general_string(from, to);
 }
 
 int
 der_copy_ia5_string (const heim_printable_string *from, 
 		     heim_printable_string *to)
 {
-    return copy_general_string(from, to);
+    return der_copy_general_string(from, to);
 }
 
 int
diff --git a/lib/asn1/der_get.c b/lib/asn1/der_get.c
index 708458f91..f4d377789 100644
--- a/lib/asn1/der_get.c
+++ b/lib/asn1/der_get.c
@@ -382,7 +382,7 @@ der_get_oid (const unsigned char *p, size_t len,
 	    u1 = u * 128 + (*p++ % 128);
 	    /* check that we don't overflow the element */
 	    if (u1 < u) {
-		free_oid(data);
+		der_free_oid(data);
 		return ASN1_OVERRUN;
 	    }
 	    u = u1;
@@ -390,7 +390,7 @@ der_get_oid (const unsigned char *p, size_t len,
 	data->components[n] = u;
     }
     if (n > 2 && p[-1] & 0x80) {
-	free_oid (data);
+	der_free_oid (data);
 	return ASN1_OVERRUN;
     }
     data->length = n;
diff --git a/lib/asn1/gen_copy.c b/lib/asn1/gen_copy.c
index cd3661d70..d8a1f1b9d 100644
--- a/lib/asn1/gen_copy.c
+++ b/lib/asn1/gen_copy.c
@@ -86,7 +86,7 @@ copy_type (const char *from, const char *to, const Type *t, int preserve)
 	if ((t->type == TSequence || t->type == TChoice) && preserve) {
 	    fprintf(codefile,
 		    "{ int ret;\n"
-		    "ret = copy_octet_string(&(%s)->_save, &(%s)->_save);\n"
+		    "ret = der_copy_octet_string(&(%s)->_save, &(%s)->_save);\n"
 		    "if (ret) goto fail;\n"
 		    "}\n",
 		    from, to);
@@ -140,7 +140,7 @@ copy_type (const char *from, const char *to, const Type *t, int preserve)
 	    if (have_ellipsis) {
 		fprintf(codefile, "case %s: {\n"
 			"int ret;\n"
-			"ret = copy_octet_string(&(%s)->u.%s, &(%s)->u.%s);\n"
+			"ret=der_copy_octet_string(&(%s)->u.%s, &(%s)->u.%s);\n"
 			"if (ret) goto fail;\n"
 			"break;\n"
 			"}\n",
diff --git a/lib/asn1/gen_free.c b/lib/asn1/gen_free.c
index dc5a7f3c5..78004c4e8 100644
--- a/lib/asn1/gen_free.c
+++ b/lib/asn1/gen_free.c
@@ -78,7 +78,7 @@ free_type (const char *name, const Type *t, int preserve)
 	    break;
 
 	if ((t->type == TSequence || t->type == TChoice) && preserve)
-	    fprintf(codefile, "free_octet_string(&data->_save);\n");
+	    fprintf(codefile, "der_free_octet_string(&data->_save);\n");
 
 	if(t->type == TChoice)
 	    fprintf(codefile, "switch((%s)->element) {\n", name);
@@ -115,7 +115,7 @@ free_type (const char *name, const Type *t, int preserve)
 	    if (have_ellipsis)
 		fprintf(codefile,
 			"case %s:\n"
-			"free_octet_string(&(%s)->u.%s);\n"
+			"der_free_octet_string(&(%s)->u.%s);\n"
 			"break;",
 			have_ellipsis->label,
 			name, have_ellipsis->gen_name);
diff --git a/lib/asn1/gen_length.c b/lib/asn1/gen_length.c
index be55ba7fa..8e04ea821 100644
--- a/lib/asn1/gen_length.c
+++ b/lib/asn1/gen_length.c
@@ -247,7 +247,7 @@ length_type (const char *name, const Type *t,
 	if (tname == NULL)
 	    errx(1, "malloc");
 	length_type (name, t->subtype, variable, tname);
-	fprintf (codefile, "ret += %lu + length_len (ret);\n", 
+	fprintf (codefile, "ret += %lu + der_length_len (ret);\n", 
 		 (unsigned long)length_tag(t->tag.tagvalue));
 	free(tname);
 	break;