diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index 1dfda6086..5f04e4a58 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -80,7 +80,7 @@ mechsrc = \
 	mech/doxygen.c \
 	mech/gss_accept_sec_context.c \
 	mech/gss_acquire_cred.c \
-	mech/gss_acquire_cred_ex.c \
+	mech/gss_acquire_cred_ext.c \
 	mech/gss_acquire_cred_with_password.c \
 	mech/gss_add_cred.c \
 	mech/gss_add_oid_set_member.c \
diff --git a/lib/gssapi/gssapi/gssapi.h b/lib/gssapi/gssapi/gssapi.h
index 3daeb4c31..1fdcc3fb6 100644
--- a/lib/gssapi/gssapi/gssapi.h
+++ b/lib/gssapi/gssapi/gssapi.h
@@ -479,7 +479,7 @@ extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_password_oid_desc;
 extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_certificate_oid_desc;
 #define GSS_C_CRED_CERTIFICATE (&__gss_c_cred_certificate_oid_desc)
 
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_acquire_cred_ex
+GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_acquire_cred_ext
            (OM_uint32 * /*minor_status*/,
             const gss_name_t /*desired_name*/,
             const gss_OID /*credential_type*/,
diff --git a/lib/gssapi/gssapi_mech.h b/lib/gssapi/gssapi_mech.h
index e0c31d40c..28e2836ee 100644
--- a/lib/gssapi/gssapi_mech.h
+++ b/lib/gssapi/gssapi_mech.h
@@ -355,14 +355,14 @@ _gss_import_cred_t(OM_uint32 * minor_status,
 
 
 typedef OM_uint32 GSSAPI_CALLCONV
-_gss_acquire_cred_ex_t(OM_uint32 * /*minor_status */,
-		       const gss_name_t /* desired_name */,
-		       const gss_OID /* credential_type */,
-		       const void * /* credential_data */,
-		       OM_uint32 /* time_req */,
-		       const gss_OID /* desired_mech */,
-		       gss_cred_usage_t /* cred_usage */,
-		       gss_cred_id_t * /* output_cred_handle */);
+_gss_acquire_cred_ext_t(OM_uint32 * /*minor_status */,
+		        const gss_name_t /* desired_name */,
+		        const gss_OID /* credential_type */,
+		        const void * /* credential_data */,
+		        OM_uint32 /* time_req */,
+		        const gss_OID /* desired_mech */,
+		        gss_cred_usage_t /* cred_usage */,
+		        gss_cred_id_t * /* output_cred_handle */);
 
 typedef void GSSAPI_CALLCONV
 _gss_iter_creds_t(OM_uint32 /* flags */,
@@ -512,7 +512,7 @@ typedef struct gssapi_mech_interface_desc {
 	_gss_store_cred_t		*gm_store_cred;
 	_gss_export_cred_t		*gm_export_cred;
 	_gss_import_cred_t		*gm_import_cred;
-	_gss_acquire_cred_ex_t		*gm_acquire_cred_ex;
+	_gss_acquire_cred_ext_t		*gm_acquire_cred_ext;
 	_gss_iter_creds_t		*gm_iter_creds;
 	_gss_destroy_cred_t		*gm_destroy_cred;
 	_gss_cred_hold_t		*gm_cred_hold;
diff --git a/lib/gssapi/krb5/acquire_cred.c b/lib/gssapi/krb5/acquire_cred.c
index 4b924759e..8c8817eb1 100644
--- a/lib/gssapi/krb5/acquire_cred.c
+++ b/lib/gssapi/krb5/acquire_cred.c
@@ -342,14 +342,14 @@ OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred
 	}
     }
 
-    ret = _gsskrb5_acquire_cred_ex(minor_status,
-				   desired_name,
-				   GSS_C_NO_OID,
-				   NULL,
-				   time_req,
-				   GSS_KRB5_MECHANISM,
-				   cred_usage,
-				   output_cred_handle);
+    ret = _gsskrb5_acquire_cred_ext(minor_status,
+				    desired_name,
+				    GSS_C_NO_OID,
+				    NULL,
+				    time_req,
+				    GSS_KRB5_MECHANISM,
+				    cred_usage,
+				    output_cred_handle);
     if (ret)
 	return ret;
 
@@ -364,7 +364,7 @@ OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred
     return ret;
 }
 
-OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred_ex
+OM_uint32 GSSAPI_CALLCONV _gsskrb5_acquire_cred_ext
 (OM_uint32 * minor_status,
  const gss_name_t desired_name,
  const gss_OID credential_type,
diff --git a/lib/gssapi/krb5/external.c b/lib/gssapi/krb5/external.c
index 81056e4ae..ff0060593 100644
--- a/lib/gssapi/krb5/external.c
+++ b/lib/gssapi/krb5/external.c
@@ -315,7 +315,7 @@ static gssapi_mech_interface_desc krb5_mech = {
     _gsskrb5_store_cred,
     _gsskrb5_export_cred,
     _gsskrb5_import_cred,
-    _gsskrb5_acquire_cred_ex,
+    _gsskrb5_acquire_cred_ext,
     NULL,
     NULL,
     NULL,
diff --git a/lib/gssapi/mech/gss_acquire_cred_ex.c b/lib/gssapi/mech/gss_acquire_cred_ext.c
similarity index 92%
rename from lib/gssapi/mech/gss_acquire_cred_ex.c
rename to lib/gssapi/mech/gss_acquire_cred_ext.c
index 26a8d06c8..1fbc8b1b5 100644
--- a/lib/gssapi/mech/gss_acquire_cred_ex.c
+++ b/lib/gssapi/mech/gss_acquire_cred_ext.c
@@ -31,7 +31,7 @@
 #include "mech_locl.h"
 
 GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gss_acquire_cred_ex(OM_uint32 *minor_status,
+gss_acquire_cred_ext(OM_uint32 *minor_status,
     const gss_name_t desired_name,
     const gss_OID credential_type,
     const void *credential_data,
@@ -50,7 +50,7 @@ gss_acquire_cred_ex(OM_uint32 *minor_status,
 
     *minor_status = 0;
     if (output_cred_handle == NULL)
-        return GSS_S_CALL_INACCESSIBLE_READ;
+	return GSS_S_CALL_INACCESSIBLE_READ;
 
     _gss_load_mech();
 
@@ -100,15 +100,15 @@ gss_acquire_cred_ex(OM_uint32 *minor_status,
 	mc->gmc_mech = m;
 	mc->gmc_mech_oid = &m->gm_mech_oid;
 
-	if (m->gm_acquire_cred_ex) {
-	    major_status = m->gm_acquire_cred_ex(minor_status,
-						 desired_mech_name,
-						 credential_type,
-						 credential_data,
-						 time_req,
-						 mc->gmc_mech_oid,
-						 cred_usage,
-						 &mc->gmc_cred);
+	if (m->gm_acquire_cred_ext) {
+	    major_status = m->gm_acquire_cred_ext(minor_status,
+						  desired_mech_name,
+						  credential_type,
+						  credential_data,
+						  time_req,
+						  mc->gmc_mech_oid,
+						  cred_usage,
+						  &mc->gmc_cred);
 	} else if (credential_type != GSS_C_NO_OID) {
 	    gss_OID_set_desc set2;
 
diff --git a/lib/gssapi/mech/gss_acquire_cred_with_password.c b/lib/gssapi/mech/gss_acquire_cred_with_password.c
index 2c67a79f7..94415ce04 100644
--- a/lib/gssapi/mech/gss_acquire_cred_with_password.c
+++ b/lib/gssapi/mech/gss_acquire_cred_with_password.c
@@ -46,14 +46,14 @@ gss_acquire_cred_with_password(OM_uint32 *minor_status,
     OM_uint32 major_status, tmp_minor;
 
     if (desired_mechs == GSS_C_NO_OID_SET) {
-	major_status = gss_acquire_cred_ex(minor_status,
-					   desired_name,
-					   GSS_C_CRED_PASSWORD,
-					   password,
-					   time_req,
-					   GSS_C_NO_OID,
-					   cred_usage,
-					   output_cred_handle);
+	major_status = gss_acquire_cred_ext(minor_status,
+					    desired_name,
+					    GSS_C_CRED_PASSWORD,
+					    password,
+					    time_req,
+					    GSS_C_NO_OID,
+					    cred_usage,
+					    output_cred_handle);
 	if (GSS_ERROR(major_status))
 	    return major_status;
     } else {
@@ -71,14 +71,14 @@ gss_acquire_cred_with_password(OM_uint32 *minor_status,
 	    struct _gss_cred *tmp_cred = NULL;
 	    struct _gss_mechanism_cred *mc;
 
-	    major_status = gss_acquire_cred_ex(minor_status,
-					       desired_name,
-					       GSS_C_CRED_PASSWORD,
-					       password,
-					       time_req,
-					       &desired_mechs->elements[i],
-					       cred_usage,
-					       (gss_cred_id_t *)&tmp_cred);
+	    major_status = gss_acquire_cred_ext(minor_status,
+						desired_name,
+						GSS_C_CRED_PASSWORD,
+						password,
+						time_req,
+						&desired_mechs->elements[i],
+						cred_usage,
+						(gss_cred_id_t *)&tmp_cred);
 	    if (GSS_ERROR(major_status))
 		continue;
 
diff --git a/lib/gssapi/mech/gss_mech_switch.c b/lib/gssapi/mech/gss_mech_switch.c
index 18ff082aa..ef7ea5169 100644
--- a/lib/gssapi/mech/gss_mech_switch.c
+++ b/lib/gssapi/mech/gss_mech_switch.c
@@ -346,7 +346,7 @@ _gss_load_mech(void)
 		OPTSYM(store_cred);
 		OPTSYM(export_cred);
 		OPTSYM(import_cred);
-		OPTSYM(acquire_cred_ex);
+		OPTSYM(acquire_cred_ext);
 		OPTSYM(iter_creds);
 		OPTSYM(destroy_cred);
 		OPTSYM(cred_hold);
diff --git a/lib/gssapi/test_context.c b/lib/gssapi/test_context.c
index 374ce9384..0758ab8b0 100644
--- a/lib/gssapi/test_context.c
+++ b/lib/gssapi/test_context.c
@@ -573,9 +573,9 @@ main(int argc, char **argv)
 	    errx(1, "gss_import_name: %s",
 		 gssapi_err(maj_stat, min_stat, GSS_C_NO_OID));
 
-	maj_stat = gss_acquire_cred_ex(&min_stat, cname,
-				       credential_type, &credential_data,
-				       0, GSS_C_NO_OID, GSS_C_INITIATE, &client_cred);
+	maj_stat = gss_acquire_cred_ext(&min_stat, cname,
+					credential_type, &credential_data,
+					0, GSS_C_NO_OID, GSS_C_INITIATE, &client_cred);
 	if (GSS_ERROR(maj_stat))
 	    errx(1, "gss_acquire_cred_ex: %s",
 		 gssapi_err(maj_stat, min_stat, GSS_C_NO_OID));
diff --git a/lib/gssapi/version-script.map b/lib/gssapi/version-script.map
index 9603b4ab9..82365131b 100644
--- a/lib/gssapi/version-script.map
+++ b/lib/gssapi/version-script.map
@@ -15,7 +15,7 @@ HEIMDAL_GSS_2.0 {
 		__gss_c_cred_certificate_oid_desc;
 		gss_accept_sec_context;
 		gss_acquire_cred;
-		gss_acquire_cred_ex;
+		gss_acquire_cred_ext;
 		gss_acquire_cred_with_password;
 		gss_add_buffer_set_member;
 		gss_add_cred;