diff --git a/lib/kadm5/ad.c b/lib/kadm5/ad.c
index 7774e16e0..26f001cd4 100644
--- a/lib/kadm5/ad.c
+++ b/lib/kadm5/ad.c
@@ -1021,7 +1021,7 @@ kadm5_ad_get_principal(void *server_handle,
 
 static kadm5_ret_t
 kadm5_ad_get_principals(void *server_handle,
-			const char *exp,
+			const char *expression,
 			char ***principals,
 			int *count)
 {
diff --git a/lib/kadm5/common_glue.c b/lib/kadm5/common_glue.c
index 6e6c62ab2..f8f932f82 100644
--- a/lib/kadm5/common_glue.c
+++ b/lib/kadm5/common_glue.c
@@ -119,11 +119,11 @@ kadm5_rename_principal(void *server_handle,
 
 kadm5_ret_t
 kadm5_get_principals(void *server_handle,
-		     const char *exp,
+		     const char *expression,
 		     char ***princs,
 		     int *count)
 {
-    return __CALL(get_principals, (server_handle, exp, princs, count));
+    return __CALL(get_principals, (server_handle, expression, princs, count));
 }
 
 kadm5_ret_t
diff --git a/lib/kadm5/get_princs_c.c b/lib/kadm5/get_princs_c.c
index b0942285b..634a20c9c 100644
--- a/lib/kadm5/get_princs_c.c
+++ b/lib/kadm5/get_princs_c.c
@@ -37,7 +37,7 @@ RCSID("$Id$");
 
 kadm5_ret_t
 kadm5_c_get_principals(void *server_handle, 
-		       const char *exp,
+		       const char *expression,
 		       char ***princs, 
 		       int *count)
 {
@@ -56,9 +56,9 @@ kadm5_c_get_principals(void *server_handle,
     if (sp == NULL)
 	return ENOMEM;
     krb5_store_int32(sp, kadm_get_princs);
-    krb5_store_int32(sp, exp != NULL);
-    if(exp)
-	krb5_store_string(sp, exp);
+    krb5_store_int32(sp, expression != NULL);
+    if(expression)
+	krb5_store_string(sp, expression);
     ret = _kadm5_client_send(context, sp);
     krb5_storage_free(sp);
     ret = _kadm5_client_recv(context, &reply);
diff --git a/lib/kadm5/get_princs_s.c b/lib/kadm5/get_princs_s.c
index 968df9765..5207d4b56 100644
--- a/lib/kadm5/get_princs_s.c
+++ b/lib/kadm5/get_princs_s.c
@@ -78,7 +78,7 @@ foreach(krb5_context context, HDB *db, hdb_entry *ent, void *data)
 
 kadm5_ret_t
 kadm5_s_get_principals(void *server_handle, 
-		       const char *exp,
+		       const char *expression,
 		       char ***princs, 
 		       int *count)
 {
@@ -90,11 +90,11 @@ kadm5_s_get_principals(void *server_handle,
 	krb5_warn(context->context, ret, "opening database");
 	return ret;
     }
-    d.exp = exp;
+    d.exp = expression;
     {
 	krb5_realm r;
 	krb5_get_default_realm(context->context, &r);
-	asprintf(&d.exp2, "%s@%s", exp, r);
+	asprintf(&d.exp2, "%s@%s", expression, r);
 	free(r);
     }
     d.princs = NULL;