diff --git a/krb5/lib/gssapi/version.map b/krb5/lib/gssapi/version.map
index c7fc5c5813a..d52c0d3d1e3 100644
--- a/krb5/lib/gssapi/version.map
+++ b/krb5/lib/gssapi/version.map
@@ -85,7 +85,7 @@ HEIMDAL_GSS_2.0 {
 		krb5_gss_register_acceptor_identity;
 };
 
-HEIMDAL_GSS_3.0 {
+gssapi_krb5_2_MIT {
 	global:
 		GSS_C_ATTR_LOCAL_LOGIN_USER;
 		GSS_C_INQ_SSPI_SESSION_KEY;
diff --git a/krb5/lib/krb5/version.map b/krb5/lib/krb5/version.map
index 16fab76fc0c..ce399a93e03 100644
--- a/krb5/lib/krb5/version.map
+++ b/krb5/lib/krb5/version.map
@@ -215,7 +215,7 @@ HEIMDAL_KRB5_2.0 {
 		krb5_write_message;
 };
 
-HEIMDAL_KRB5_3.0 {
+krb5_3_MIT {
 	global:
 		_krb5_conf_boolean;
 		decode_krb5_ad_kdcissued;
diff --git a/krb5/util/et/version.map b/krb5/util/et/version.map
index f659576e828..3bd290009f2 100644
--- a/krb5/util/et/version.map
+++ b/krb5/util/et/version.map
@@ -8,7 +8,7 @@ HEIMDAL_COM_ERR_1.0 {
 		set_com_err_hook;
 };
 
-HEIMDAL_COM_ERR_2.0 {
+com_err_3_MIT {
 	global:
 		add_error_table;
 		error_table_name_r;