diff --git a/admin/dump.c b/admin/dump.c
index 9be0c2f48..5bd4b52b5 100644
--- a/admin/dump.c
+++ b/admin/dump.c
@@ -20,10 +20,10 @@ key2str(krb5_keyblock *key)
     int i;
     if(s)
 	free(s);
-    s = malloc(key->contents.length/2+10);
+    s = malloc(key->keyvalue.length/2+10);
     sprintf(s, "%d:", key->keytype);
-    p = (unsigned char*)key->contents.data;
-    for(i = 0; i < key->contents.length; i++)
+    p = (unsigned char*)key->keyvalue.data;
+    for(i = 0; i < key->keyvalue.length; i++)
 	sprintf(s + strlen(s), "%02x", p[i]);
     return s;
 }
diff --git a/admin/extkeytab.c b/admin/extkeytab.c
index 9c6f9579b..8a157f123 100644
--- a/admin/extkeytab.c
+++ b/admin/extkeytab.c
@@ -40,10 +40,10 @@ ext_keytab(int argc, char **argv)
     krb5_copy_principal (context, ent.principal, &key_entry.principal);
     key_entry.vno = ent.kvno;
     key_entry.keyblock.keytype = ent.keyblock.keytype;
-    key_entry.keyblock.contents.length = 0;
-    krb5_data_copy(&key_entry.keyblock.contents,
-		   ent.keyblock.contents.data,
-		   ent.keyblock.contents.length);
+    key_entry.keyblock.keyvalue.length = 0;
+    krb5_data_copy(&key_entry.keyblock.keyvalue,
+		   ent.keyblock.keyvalue.data,
+		   ent.keyblock.keyvalue.length);
 
     ret = krb5_kt_default (context, &kid);
     if (ret) {
diff --git a/admin/init.c b/admin/init.c
index 55efb8f94..04a6fe2d0 100644
--- a/admin/init.c
+++ b/admin/init.c
@@ -80,10 +80,9 @@ init(int argc, char **argv)
 	
 	/* Create `krbtgt/REALM' */
 	ent.keyblock.keytype = KEYTYPE_DES;
-	ent.keyblock.contents.length = 8;
-	ent.keyblock.contents.data = malloc(ent.keyblock.contents.length);
-	des_rand_data(ent.keyblock.contents.data, 
-		      ent.keyblock.contents.length);
+	ent.keyblock.keyvalue.length = 8;
+	ent.keyblock.keyvalue.data = malloc(ent.keyblock.keyvalue.length);
+	des_new_random_key(ent.keyblock.keyvalue.data);
 	ent.kvno = 1;
 	ent.max_life = max_life;
 	ent.max_renew = max_renew;
@@ -106,8 +105,8 @@ init(int argc, char **argv)
 			     "default",
 			     NULL);
 	ent.keyblock.keytype = KEYTYPE_DES;
-	ent.keyblock.contents.length = 0;
-	ent.keyblock.contents.data = NULL;
+	ent.keyblock.keyvalue.length = 0;
+	ent.keyblock.keyvalue.data = NULL;
 	ent.kvno = 1;
 	ent.max_life = default_life;
 	ent.max_renew = default_renew;
diff --git a/admin/load.c b/admin/load.c
index 3e888dcb6..9d4ca42a2 100644
--- a/admin/load.c
+++ b/admin/load.c
@@ -84,13 +84,13 @@ doit(char *filename, int merge)
 	}
 	
 	ent.keyblock.keytype = KEYTYPE_DES;
-	ent.keyblock.contents.data = malloc(strlen(e.key)/2+1);
+	ent.keyblock.keyvalue.data = malloc(strlen(e.key)/2+1);
 	for(i = 1; i < strlen(e.key) - 1; i += 2){
 	    unsigned tmp;
 	    sscanf(e.key + i, "%2x", &tmp);
-	    ((unsigned char *)ent.keyblock.contents.data)[i/2] = tmp;
+	    ((unsigned char *)ent.keyblock.keyvalue.data)[i/2] = tmp;
 	}
-	ent.keyblock.contents.length = i / 2;
+	ent.keyblock.keyvalue.length = i / 2;
 	ent.kvno = atoi(e.kvno);
 	ent.max_life = atoi(e.max_life);
 	ent.max_renew = atoi(e.max_renew);
diff --git a/kadmin/dump.c b/kadmin/dump.c
index 9be0c2f48..5bd4b52b5 100644
--- a/kadmin/dump.c
+++ b/kadmin/dump.c
@@ -20,10 +20,10 @@ key2str(krb5_keyblock *key)
     int i;
     if(s)
 	free(s);
-    s = malloc(key->contents.length/2+10);
+    s = malloc(key->keyvalue.length/2+10);
     sprintf(s, "%d:", key->keytype);
-    p = (unsigned char*)key->contents.data;
-    for(i = 0; i < key->contents.length; i++)
+    p = (unsigned char*)key->keyvalue.data;
+    for(i = 0; i < key->keyvalue.length; i++)
 	sprintf(s + strlen(s), "%02x", p[i]);
     return s;
 }
diff --git a/kadmin/init.c b/kadmin/init.c
index 55efb8f94..04a6fe2d0 100644
--- a/kadmin/init.c
+++ b/kadmin/init.c
@@ -80,10 +80,9 @@ init(int argc, char **argv)
 	
 	/* Create `krbtgt/REALM' */
 	ent.keyblock.keytype = KEYTYPE_DES;
-	ent.keyblock.contents.length = 8;
-	ent.keyblock.contents.data = malloc(ent.keyblock.contents.length);
-	des_rand_data(ent.keyblock.contents.data, 
-		      ent.keyblock.contents.length);
+	ent.keyblock.keyvalue.length = 8;
+	ent.keyblock.keyvalue.data = malloc(ent.keyblock.keyvalue.length);
+	des_new_random_key(ent.keyblock.keyvalue.data);
 	ent.kvno = 1;
 	ent.max_life = max_life;
 	ent.max_renew = max_renew;
@@ -106,8 +105,8 @@ init(int argc, char **argv)
 			     "default",
 			     NULL);
 	ent.keyblock.keytype = KEYTYPE_DES;
-	ent.keyblock.contents.length = 0;
-	ent.keyblock.contents.data = NULL;
+	ent.keyblock.keyvalue.length = 0;
+	ent.keyblock.keyvalue.data = NULL;
 	ent.kvno = 1;
 	ent.max_life = default_life;
 	ent.max_renew = default_renew;
diff --git a/kadmin/load.c b/kadmin/load.c
index 3e888dcb6..9d4ca42a2 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -84,13 +84,13 @@ doit(char *filename, int merge)
 	}
 	
 	ent.keyblock.keytype = KEYTYPE_DES;
-	ent.keyblock.contents.data = malloc(strlen(e.key)/2+1);
+	ent.keyblock.keyvalue.data = malloc(strlen(e.key)/2+1);
 	for(i = 1; i < strlen(e.key) - 1; i += 2){
 	    unsigned tmp;
 	    sscanf(e.key + i, "%2x", &tmp);
-	    ((unsigned char *)ent.keyblock.contents.data)[i/2] = tmp;
+	    ((unsigned char *)ent.keyblock.keyvalue.data)[i/2] = tmp;
 	}
-	ent.keyblock.contents.length = i / 2;
+	ent.keyblock.keyvalue.length = i / 2;
 	ent.kvno = atoi(e.kvno);
 	ent.max_life = atoi(e.max_life);
 	ent.max_renew = atoi(e.max_renew);