diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index 50c247be3..060e598e7 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -959,7 +959,8 @@ as_rep(KDC_REQ *req,
     
     {
 	char str[128];
-	unparse_flags(KDCOptions2int(f), KDCOptions_units, str, sizeof(str));
+	unparse_flags(KDCOptions2int(f), asn1_KDCOptions_units(), 
+		      str, sizeof(str));
 	if(*str)
 	    kdc_log(2, "Requested flags: %s", str);
     }
@@ -1977,7 +1978,8 @@ tgs_rep2(KDC_REQ_BODY *b,
 	ret = krb5_unparse_name(context, cp, &cpn);
 	if (ret)
 	    goto out;
-	unparse_flags (KDCOptions2int(b->kdc_options), KDCOptions_units,
+	unparse_flags (KDCOptions2int(b->kdc_options),
+		       asn1_KDCOptions_units(),
 		       opt_str, sizeof(opt_str));
 	if(*opt_str)
 	    kdc_log(0, "TGS-REQ %s from %s for %s [%s]", 
diff --git a/lib/kadm5/dump_log.c b/lib/kadm5/dump_log.c
index 0ef30084b..ec3f47cdd 100644
--- a/lib/kadm5/dump_log.c
+++ b/lib/kadm5/dump_log.c
@@ -150,7 +150,7 @@ print_entry(kadm5_server_context *server_context,
 	}
 	if(mask & KADM5_ATTRIBUTES) {
 	    unparse_flags(HDBFlags2int(ent.flags), 
-			  HDBFlags_units, t, sizeof(t));
+			  asn1_HDBFlags_units(), t, sizeof(t));
 	    printf("    attributes = %s\n", t);
 	}
 	if(mask & KADM5_MAX_LIFE) {