diff --git a/admin/dump.c b/admin/dump.c
index a83014fdc..081337de4 100644
--- a/admin/dump.c
+++ b/admin/dump.c
@@ -143,7 +143,7 @@ hdb_entry2string(hdb_entry *ent, char **str)
 	strcat(buf, "-");
     
     strcat(buf, " ");
-    asprintf(&p, "%d", flags2int(ent->flags));
+    asprintf(&p, "%d", HDBFlags2int(ent->flags));
     strcat(buf, p);
     free(p);
 
diff --git a/admin/load.c b/admin/load.c
index ab1e8c426..cb4c273d1 100644
--- a/admin/load.c
+++ b/admin/load.c
@@ -173,7 +173,7 @@ parse_hdbflags2int(char *str)
     unsigned i;
     parse_integer(&i, str);
 
-    return int2flags(i);
+    return int2HDBFlags(i);
 }
 
 static void
diff --git a/kadmin/dump.c b/kadmin/dump.c
index a83014fdc..081337de4 100644
--- a/kadmin/dump.c
+++ b/kadmin/dump.c
@@ -143,7 +143,7 @@ hdb_entry2string(hdb_entry *ent, char **str)
 	strcat(buf, "-");
     
     strcat(buf, " ");
-    asprintf(&p, "%d", flags2int(ent->flags));
+    asprintf(&p, "%d", HDBFlags2int(ent->flags));
     strcat(buf, p);
     free(p);
 
diff --git a/kadmin/load.c b/kadmin/load.c
index ab1e8c426..cb4c273d1 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -173,7 +173,7 @@ parse_hdbflags2int(char *str)
     unsigned i;
     parse_integer(&i, str);
 
-    return int2flags(i);
+    return int2HDBFlags(i);
 }
 
 static void