diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index cec338fe9..355f6316e 100644
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -137,9 +137,9 @@ _krb5_extract_ticket(krb5_context context,
     time_t tmp_time;
     krb5_timestamp sec_now;
 
-    ret = principalname2krb5_principal (&tmp_principal,
-					rep->kdc_rep.cname,
-					rep->kdc_rep.crealm);
+    ret = _krb5_principalname2krb5_principal (&tmp_principal,
+					      rep->kdc_rep.cname,
+					      rep->kdc_rep.crealm);
     if (ret)
 	goto out;
 
@@ -170,9 +170,9 @@ _krb5_extract_ticket(krb5_context context,
 
     /* compare server */
 
-    ret = principalname2krb5_principal (&tmp_principal,
-					rep->kdc_rep.ticket.sname,
-					rep->kdc_rep.ticket.realm);
+    ret = _krb5_principalname2krb5_principal (&tmp_principal,
+					      rep->kdc_rep.ticket.sname,
+					      rep->kdc_rep.ticket.realm);
     if (ret)
 	goto out;
     if(allow_server_mismatch){
@@ -440,10 +440,10 @@ init_as_req (krb5_context context,
 	krb5_set_error_string(context, "malloc: out of memory");
 	goto fail;
     }
-    ret = krb5_principal2principalname (a->req_body.cname, creds->client);
+    ret = _krb5_principal2principalname (a->req_body.cname, creds->client);
     if (ret)
 	goto fail;
-    ret = krb5_principal2principalname (a->req_body.sname, creds->server);
+    ret = _krb5_principal2principalname (a->req_body.sname, creds->server);
     if (ret)
 	goto fail;
     ret = copy_Realm(&creds->client->realm, &a->req_body.realm);
diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
index 9dee50fd7..4245def97 100644
--- a/lib/krb5/init_creds_pw.c
+++ b/lib/krb5/init_creds_pw.c
@@ -545,7 +545,7 @@ init_creds_init_as_req (krb5_context context,
 	goto fail;
     }
     if (creds->client) {
-	ret = krb5_principal2principalname (a->req_body.cname, creds->client);
+	ret = _krb5_principal2principalname (a->req_body.cname, creds->client);
 	if (ret)
 	    goto fail;
 	ret = copy_Realm(&creds->client->realm, &a->req_body.realm);
@@ -561,7 +561,7 @@ init_creds_init_as_req (krb5_context context,
 	ret = copy_Realm(&realm, &a->req_body.realm);
 	free(realm);
     }
-    ret = krb5_principal2principalname (a->req_body.sname, creds->server);
+    ret = _krb5_principal2principalname (a->req_body.sname, creds->server);
     if (ret)
 	goto fail;
 
diff --git a/lib/krb5/rd_cred.c b/lib/krb5/rd_cred.c
index 2c03e915b..244f582b1 100644
--- a/lib/krb5/rd_cred.c
+++ b/lib/krb5/rd_cred.c
@@ -234,9 +234,9 @@ krb5_rd_cred(krb5_context context,
 	    krb5_abortx(context, "internal error in ASN.1 encoder");
 	copy_EncryptionKey (&kci->key, &creds->session);
 	if (kci->prealm && kci->pname)
-	    principalname2krb5_principal (&creds->client,
-					  *kci->pname,
-					  *kci->prealm);
+	    _krb5_principalname2krb5_principal (&creds->client,
+						*kci->pname,
+						*kci->prealm);
 	if (kci->flags)
 	    creds->flags.b = *kci->flags;
 	if (kci->authtime)
@@ -248,9 +248,9 @@ krb5_rd_cred(krb5_context context,
 	if (kci->renew_till)
 	    creds->times.renew_till = *kci->renew_till;
 	if (kci->srealm && kci->sname)
-	    principalname2krb5_principal (&creds->server,
-					  *kci->sname,
-					  *kci->srealm);
+	    _krb5_principalname2krb5_principal (&creds->server,
+						*kci->sname,
+						*kci->srealm);
 	if (kci->caddr)
 	    krb5_copy_addresses (context,
 				 kci->caddr,
diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index fc90d0f79..ce9f9a30b 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -312,10 +312,10 @@ krb5_verify_ap_req2(krb5_context context,
     if(ret)
 	goto out;
 
-    principalname2krb5_principal(&t->server, ap_req->ticket.sname, 
-				 ap_req->ticket.realm);
-    principalname2krb5_principal(&t->client, t->ticket.cname, 
-				 t->ticket.crealm);
+    _krb5_principalname2krb5_principal(&t->server, ap_req->ticket.sname, 
+				       ap_req->ticket.realm);
+    _krb5_principalname2krb5_principal(&t->client, t->ticket.cname, 
+				       t->ticket.crealm);
 
     /* save key */
 
@@ -333,12 +333,12 @@ krb5_verify_ap_req2(krb5_context context,
 	krb5_principal p1, p2;
 	krb5_boolean res;
 	
-	principalname2krb5_principal(&p1,
-				     ac->authenticator->cname,
-				     ac->authenticator->crealm);
-	principalname2krb5_principal(&p2, 
-				     t->ticket.cname,
-				     t->ticket.crealm);
+	_krb5_principalname2krb5_principal(&p1,
+					   ac->authenticator->cname,
+					   ac->authenticator->crealm);
+	_krb5_principalname2krb5_principal(&p2, 
+					   t->ticket.cname,
+					   t->ticket.crealm);
 	res = krb5_principal_compare (context, p1, p2);
 	krb5_free_principal (context, p1);
 	krb5_free_principal (context, p2);
@@ -501,9 +501,9 @@ krb5_rd_req(krb5_context context,
 	return ret;
 
     if(server == NULL){
-	principalname2krb5_principal(&service,
-				     ap_req.ticket.sname,
-				     ap_req.ticket.realm);
+	_krb5_principalname2krb5_principal(&service,
+					   ap_req.ticket.sname,
+					   ap_req.ticket.realm);
 	server = service;
     }
     if (ap_req.ap_options.use_session_key &&