Rename functions from k5_ipc_stream_* to krb5int_ipc_stream_*, because some of them will have to be exported

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21938 dc483132-0cff-0310-8789-dd5450dbe970

28 files changed, 528 insertions, 528 deletions

diff --git a/src/ccapi/common/cci_cred_union.c b/src/ccapi/common/cci_cred_union.c
index 9740ffd473..94aebddf2a 100644
--- a/src/ccapi/common/cci_cred_union.c
+++ b/src/ccapi/common/cci_cred_union.c
@@ -63,59 +63,59 @@ static cc_uint32 cci_credentials_v4_read (cc_credentials_v4_t **out_v4creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v4creds->version);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v4creds->version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->principal, cc_v4_name_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->principal, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->principal_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->principal_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->service, cc_v4_name_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->service, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->service_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->service_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->realm, cc_v4_realm_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->realm, cc_v4_realm_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->session_key, cc_v4_key_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->session_key, cc_v4_key_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->kvno);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->kvno);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->string_to_key_type);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->string_to_key_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v4creds->issue_date);
+        err = krb5int_ipc_stream_read_time (io_stream, &v4creds->issue_date);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->lifetime);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v4creds->address);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v4creds->address);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &v4creds->ticket_size);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &v4creds->ticket_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, v4creds->ticket, cc_v4_ticket_size);
+        err = krb5int_ipc_stream_read (io_stream, v4creds->ticket, cc_v4_ticket_size);
     }
     
     if (!err) {
@@ -139,59 +139,59 @@ static cc_uint32 cci_credentials_v4_write (cc_credentials_v4_t *in_v4creds,
     if (!in_v4creds) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v4creds->version);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v4creds->version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->principal, cc_v4_name_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->principal, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->principal_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->principal_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->service, cc_v4_name_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->service, cc_v4_name_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->service_instance, cc_v4_instance_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->service_instance, cc_v4_instance_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->realm, cc_v4_realm_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->realm, cc_v4_realm_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->session_key, cc_v4_key_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->session_key, cc_v4_key_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->kvno);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->kvno);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->string_to_key_type);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->string_to_key_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v4creds->issue_date);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v4creds->issue_date);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->lifetime);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v4creds->address);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v4creds->address);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, in_v4creds->ticket_size);
+        err = krb5int_ipc_stream_write_int32 (io_stream, in_v4creds->ticket_size);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_v4creds->ticket, cc_v4_ticket_size);
+        err = krb5int_ipc_stream_write (io_stream, in_v4creds->ticket, cc_v4_ticket_size);
     }
     
     return cci_check_error (err);
@@ -249,11 +249,11 @@ static cc_uint32 cci_cc_data_read (cc_data      *io_ccdata,
     if (!io_ccdata) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &type);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &length);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &length);
     }
     
     if (!err && length > 0) {
@@ -261,7 +261,7 @@ static cc_uint32 cci_cc_data_read (cc_data      *io_ccdata,
         if (!data) { err = cci_check_error (ccErrNoMem); }
 
         if (!err) {
-            err = k5_ipc_stream_read (io_stream, data, length);
+            err = krb5int_ipc_stream_read (io_stream, data, length);
         }
     }
     
@@ -288,15 +288,15 @@ static cc_uint32 cci_cc_data_write (cc_data      *in_ccdata,
     if (!in_ccdata) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_ccdata->type);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_ccdata->type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_ccdata->length);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_ccdata->length);
     }
     
     if (!err && in_ccdata->length > 0) {
-        err = k5_ipc_stream_write (io_stream, in_ccdata->data, in_ccdata->length);
+        err = krb5int_ipc_stream_write (io_stream, in_ccdata->data, in_ccdata->length);
     }
     
     return cci_check_error (err);
@@ -340,7 +340,7 @@ static cc_uint32 cci_cc_data_array_read (cc_data      ***io_ccdata_array,
     if (!io_ccdata_array) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &count);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &count);
     }
     
     if (!err && count > 0) {
@@ -387,7 +387,7 @@ static cc_uint32 cci_cc_data_array_write (cc_data      **in_ccdata_array,
     if (!err) {
         for (count = 0; in_ccdata_array && in_ccdata_array[count]; count++);
         
-        err = k5_ipc_stream_write_uint32 (io_stream, count);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, count);
     }
     
     if (!err) {
@@ -461,11 +461,11 @@ static cc_uint32 cci_credentials_v5_read (cc_credentials_v5_t **out_v5creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (io_stream, &v5creds->client);
+        err = krb5int_ipc_stream_read_string (io_stream, &v5creds->client);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (io_stream, &v5creds->server);
+        err = krb5int_ipc_stream_read_string (io_stream, &v5creds->server);
     }
     
     if (!err) {
@@ -473,27 +473,27 @@ static cc_uint32 cci_credentials_v5_read (cc_credentials_v5_t **out_v5creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->authtime);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->authtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->starttime);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->starttime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->endtime);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->endtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (io_stream, &v5creds->renew_till);
+        err = krb5int_ipc_stream_read_time (io_stream, &v5creds->renew_till);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v5creds->is_skey);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v5creds->is_skey);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &v5creds->ticket_flags);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &v5creds->ticket_flags);
     }
     
     if (!err) {
@@ -533,11 +533,11 @@ static cc_uint32 cci_credentials_v5_write (cc_credentials_v5_t *in_v5creds,
     if (!in_v5creds) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_v5creds->client);
+        err = krb5int_ipc_stream_write_string (io_stream, in_v5creds->client);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_v5creds->server);
+        err = krb5int_ipc_stream_write_string (io_stream, in_v5creds->server);
     }
     
     if (!err) {
@@ -545,27 +545,27 @@ static cc_uint32 cci_credentials_v5_write (cc_credentials_v5_t *in_v5creds,
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->authtime);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->authtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->starttime);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->starttime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->endtime);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->endtime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_stream, in_v5creds->renew_till);
+        err = krb5int_ipc_stream_write_time (io_stream, in_v5creds->renew_till);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v5creds->is_skey);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v5creds->is_skey);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_v5creds->ticket_flags);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_v5creds->ticket_flags);
     }
     
     if (!err) {
@@ -629,7 +629,7 @@ cc_uint32 cci_credentials_union_read (cc_credentials_union **out_credentials_uni
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &credentials_union->version);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &credentials_union->version);
     }
     
     if (!err) {
@@ -668,7 +668,7 @@ cc_uint32 cci_credentials_union_write (const cc_credentials_union *in_credential
     if (!in_credentials_union) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_stream, in_credentials_union->version);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, in_credentials_union->version);
     }
     
     if (!err) {
diff --git a/src/ccapi/common/cci_identifier.c b/src/ccapi/common/cci_identifier.c
index 5ca962f1cd..a027c70c5b 100644
--- a/src/ccapi/common/cci_identifier.c
+++ b/src/ccapi/common/cci_identifier.c
@@ -252,19 +252,19 @@ cc_uint32 cci_identifier_read (cci_identifier_t *out_identifier,
     if (!io_stream     ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (io_stream, &server_id);
+        err = krb5int_ipc_stream_read_string (io_stream, &server_id);
     }
 
     if (!err) {
-        err = k5_ipc_stream_read_string (io_stream, &object_id);
+        err = krb5int_ipc_stream_read_string (io_stream, &object_id);
     }    
      
     if (!err) {
         err = cci_identifier_alloc (out_identifier, server_id, object_id);
     }
     
-    k5_ipc_stream_free_string (server_id);
-    k5_ipc_stream_free_string (object_id);
+    krb5int_ipc_stream_free_string (server_id);
+    krb5int_ipc_stream_free_string (object_id);
     
     return cci_check_error (err);
 }
@@ -280,11 +280,11 @@ cc_uint32 cci_identifier_write (cci_identifier_t in_identifier,
     if (!io_stream    ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_identifier->server_id);
+        err = krb5int_ipc_stream_write_string (io_stream, in_identifier->server_id);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_identifier->object_id);
+        err = krb5int_ipc_stream_write_string (io_stream, in_identifier->object_id);
     }
     
     return cci_check_error (err);
diff --git a/src/ccapi/common/cci_message.c b/src/ccapi/common/cci_message.c
index b541558893..0e12c0d486 100644
--- a/src/ccapi/common/cci_message.c
+++ b/src/ccapi/common/cci_message.c
@@ -67,11 +67,11 @@ cc_int32 cci_message_new_request_header (k5_ipc_stream      *out_request,
     if (!out_request) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_request_name);
+        err = krb5int_ipc_stream_write_uint32 (request, in_request_name);
     }
     
     if (!err) {
@@ -83,7 +83,7 @@ cc_int32 cci_message_new_request_header (k5_ipc_stream      *out_request,
         request = NULL;
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -103,7 +103,7 @@ cc_int32 cci_message_read_request_header (k5_ipc_stream       in_request,
     if (!out_identifier  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request, &request_name);
+        err = krb5int_ipc_stream_read_uint32 (in_request, &request_name);
     }
     
     if (!err) {
@@ -132,11 +132,11 @@ cc_int32 cci_message_new_reply_header (k5_ipc_stream     *out_reply,
     if (!out_reply) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
     
     if (!err) {
@@ -144,7 +144,7 @@ cc_int32 cci_message_new_reply_header (k5_ipc_stream     *out_reply,
         reply = NULL;
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -161,7 +161,7 @@ cc_int32 cci_message_read_reply_header (k5_ipc_stream      in_reply,
     if (!out_reply_error) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (in_reply, &reply_err);
+        err = krb5int_ipc_stream_read_int32 (in_reply, &reply_err);
     }
     
     if (!err) {
@@ -177,7 +177,7 @@ cc_int32 cci_message_read_reply_header (k5_ipc_stream      in_reply,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_read_time (k5_ipc_stream  io_stream, 
+uint32_t krb5int_ipc_stream_read_time (k5_ipc_stream  io_stream, 
                                   cc_time_t     *out_time)
 {
     int32_t err = 0;
@@ -187,7 +187,7 @@ uint32_t k5_ipc_stream_read_time (k5_ipc_stream  io_stream,
     if (!out_time ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_int64 (io_stream, &t);
+        err = krb5int_ipc_stream_read_int64 (io_stream, &t);
     }
     
     if (!err) {
@@ -199,15 +199,15 @@ uint32_t k5_ipc_stream_read_time (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_write_time (k5_ipc_stream io_stream, 
-                                   cc_time_t     in_time)
+uint32_t krb5int_ipc_stream_write_time (k5_ipc_stream io_stream, 
+					cc_time_t     in_time)
 {
     int32_t err = 0;
     
     if (!io_stream) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_int64 (io_stream, in_time);
+        err = krb5int_ipc_stream_write_int64 (io_stream, in_time);
     }
     
     return cci_check_error (err);
diff --git a/src/ccapi/common/cci_message.h b/src/ccapi/common/cci_message.h
index 27ed9c1f2d..8c1795b057 100644
--- a/src/ccapi/common/cci_message.h
+++ b/src/ccapi/common/cci_message.h
@@ -45,9 +45,9 @@ cc_int32 cci_message_new_reply_header (k5_ipc_stream     *out_reply,
 cc_int32 cci_message_read_reply_header (k5_ipc_stream in_reply,
                                         cc_int32     *out_reply_error);
 
-uint32_t k5_ipc_stream_read_time (k5_ipc_stream  io_stream, 
-                               cc_time_t     *out_time);
-uint32_t k5_ipc_stream_write_time (k5_ipc_stream io_stream, 
-                                cc_time_t     in_time);
+uint32_t krb5int_ipc_stream_read_time (k5_ipc_stream  io_stream, 
+				       cc_time_t     *out_time);
+uint32_t krb5int_ipc_stream_write_time (k5_ipc_stream io_stream, 
+					cc_time_t     in_time);
 
 #endif /* CCI_MESSAGE_H */
diff --git a/src/ccapi/lib/ccapi_ccache.c b/src/ccapi/lib/ccapi_ccache.c
index 57c6f83aa3..ec64c44d20 100644
--- a/src/ccapi/lib/ccapi_ccache.c
+++ b/src/ccapi/lib/ccapi_ccache.c
@@ -221,10 +221,10 @@ cc_int32 ccapi_ccache_get_credentials_version (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (reply, out_credentials_version);
+        err = krb5int_ipc_stream_read_uint32 (reply, out_credentials_version);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -250,15 +250,15 @@ cc_int32 ccapi_ccache_get_name (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (reply, &name);
+        err = krb5int_ipc_stream_read_string (reply, &name);
     }
     
     if (!err) {
         err = cci_string_new (out_name, name);
     }
     
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_free_string (name);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (name);
         
     return cci_check_error (err);
 }
@@ -279,11 +279,11 @@ cc_int32 ccapi_ccache_get_principal (cc_ccache_t  in_ccache,
     if (!out_principal) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
@@ -294,16 +294,16 @@ cc_int32 ccapi_ccache_get_principal (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (reply, &principal);
+        err = krb5int_ipc_stream_read_string (reply, &principal);
     }
     
     if (!err) {
         err = cci_string_new (out_principal, principal);
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);
 }
@@ -322,15 +322,15 @@ cc_int32 ccapi_ccache_set_principal (cc_ccache_t  io_ccache,
     if (!in_principal) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
 
     if (!err) {
@@ -340,7 +340,7 @@ cc_int32 ccapi_ccache_set_principal (cc_ccache_t  io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
 
     return cci_check_error (err);
 }
@@ -358,7 +358,7 @@ cc_int32 ccapi_ccache_store_credentials (cc_ccache_t                 io_ccache,
     if (!in_credentials_union) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
@@ -372,7 +372,7 @@ cc_int32 ccapi_ccache_store_credentials (cc_ccache_t                 io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -390,7 +390,7 @@ cc_int32 ccapi_ccache_remove_credentials (cc_ccache_t      io_ccache,
     if (!in_credentials) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
@@ -404,7 +404,7 @@ cc_int32 ccapi_ccache_remove_credentials (cc_ccache_t      io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -437,7 +437,7 @@ cc_int32 ccapi_ccache_new_credentials_iterator (cc_ccache_t                in_cc
         err = cci_credentials_iterator_new (out_credentials_iterator, identifier);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
 
     return cci_check_error (err);
@@ -459,7 +459,7 @@ cc_int32 ccapi_ccache_move (cc_ccache_t io_source_ccache,
     if (!io_destination_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
@@ -473,7 +473,7 @@ cc_int32 ccapi_ccache_move (cc_ccache_t io_source_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
 
     return cci_check_error (err);
 }
@@ -491,15 +491,15 @@ cc_int32 ccapi_ccache_lock (cc_ccache_t io_ccache,
     if (!io_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_lock_type);
+        err = krb5int_ipc_stream_write_uint32 (request, in_lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_block);
+        err = krb5int_ipc_stream_write_uint32 (request, in_block);
     }
     
     if (!err) {
@@ -509,7 +509,7 @@ cc_int32 ccapi_ccache_lock (cc_ccache_t io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -553,10 +553,10 @@ cc_int32 ccapi_ccache_get_last_default_time (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, out_last_default_time);
+        err = krb5int_ipc_stream_read_time (reply, out_last_default_time);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
 
     return cci_check_error (err);
 }
@@ -581,10 +581,10 @@ cc_int32 ccapi_ccache_get_change_time (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, out_change_time);
+        err = krb5int_ipc_stream_read_time (reply, out_change_time);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -601,11 +601,11 @@ cc_int32 ccapi_ccache_wait_for_change (cc_ccache_t  in_ccache)
     if (!in_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (request, ccache->last_wait_for_change_time);
+        err = krb5int_ipc_stream_write_time (request, ccache->last_wait_for_change_time);
     }
     
     if (!err) {
@@ -616,11 +616,11 @@ cc_int32 ccapi_ccache_wait_for_change (cc_ccache_t  in_ccache)
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, &ccache->last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (reply, &ccache->last_wait_for_change_time);
     }    
         
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -663,11 +663,11 @@ cc_int32 ccapi_ccache_get_kdc_time_offset (cc_ccache_t  in_ccache,
     if (!out_time_offset) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
 
     if (!err) {
@@ -678,11 +678,11 @@ cc_int32 ccapi_ccache_get_kdc_time_offset (cc_ccache_t  in_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, out_time_offset);
+        err = krb5int_ipc_stream_read_time (reply, out_time_offset);
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -700,15 +700,15 @@ cc_int32 ccapi_ccache_set_kdc_time_offset (cc_ccache_t io_ccache,
     if (!io_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (request, in_time_offset);
+        err = krb5int_ipc_stream_write_time (request, in_time_offset);
     }
     
     if (!err) {
@@ -718,7 +718,7 @@ cc_int32 ccapi_ccache_set_kdc_time_offset (cc_ccache_t io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -735,11 +735,11 @@ cc_int32 ccapi_ccache_clear_kdc_time_offset (cc_ccache_t io_ccache,
     if (!io_ccache) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_credentials_version);
+        err = krb5int_ipc_stream_write_uint32 (request, in_credentials_version);
     }
     
     if (!err) {
@@ -749,7 +749,7 @@ cc_int32 ccapi_ccache_clear_kdc_time_offset (cc_ccache_t io_ccache,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/ccapi_ccache_iterator.c b/src/ccapi/lib/ccapi_ccache_iterator.c
index 0f5d241f94..0df9e0f8ef 100644
--- a/src/ccapi/lib/ccapi_ccache_iterator.c
+++ b/src/ccapi/lib/ccapi_ccache_iterator.c
@@ -193,7 +193,7 @@ cc_int32 ccapi_ccache_iterator_next (cc_ccache_iterator_t  in_ccache_iterator,
         err = cci_ccache_new (out_ccache, identifier);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
     
     return cci_check_error (err);
@@ -240,7 +240,7 @@ cc_int32 ccapi_ccache_iterator_clone (cc_ccache_iterator_t  in_ccache_iterator,
     }
 
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/ccapi_context.c b/src/ccapi/lib/ccapi_context.c
index 7ba3db4d26..9b1d05dc83 100644
--- a/src/ccapi/lib/ccapi_context.c
+++ b/src/ccapi/lib/ccapi_context.c
@@ -247,11 +247,11 @@ cc_int32 ccapi_context_get_change_time (cc_context_t  in_context,
                                        NULL, &reply);
     }
     
-    if (!err && k5_ipc_stream_size (reply) > 0) {
+    if (!err && krb5int_ipc_stream_size (reply) > 0) {
         cc_time_t change_time = 0;
         
         /* got a response from the server */
-        err = k5_ipc_stream_read_time (reply, &change_time);
+        err = krb5int_ipc_stream_read_time (reply, &change_time);
         
         if (!err) {
             err = cci_context_change_time_update (context->identifier,
@@ -263,7 +263,7 @@ cc_int32 ccapi_context_get_change_time (cc_context_t  in_context,
         err = cci_context_change_time_get (out_change_time);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -280,11 +280,11 @@ cc_int32 ccapi_context_wait_for_change (cc_context_t  in_context)
     if (!in_context) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (request, context->last_wait_for_change_time);
+        err = krb5int_ipc_stream_write_time (request, context->last_wait_for_change_time);
     }
 
     if (!err) {
@@ -299,11 +299,11 @@ cc_int32 ccapi_context_wait_for_change (cc_context_t  in_context)
     }
 
     if (!err) {
-        err = k5_ipc_stream_read_time (reply, &context->last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (reply, &context->last_wait_for_change_time);
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
 
     return cci_check_error (err);
 }
@@ -334,9 +334,9 @@ cc_int32 ccapi_context_get_default_ccache_name (cc_context_t  in_context,
     }
     
     if (!err) {
-        if (k5_ipc_stream_size (reply) > 0) {
+        if (krb5int_ipc_stream_size (reply) > 0) {
             /* got a response from the server */
-            err = k5_ipc_stream_read_string (reply, &reply_name);
+            err = krb5int_ipc_stream_read_string (reply, &reply_name);
             
             if (!err) {
                 name = reply_name;
@@ -350,8 +350,8 @@ cc_int32 ccapi_context_get_default_ccache_name (cc_context_t  in_context,
         err = cci_string_new (out_name, name);
     }
     
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_free_string (reply_name);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (reply_name);
     
     return cci_check_error (err);
 }
@@ -373,11 +373,11 @@ cc_int32 ccapi_context_open_ccache (cc_context_t  in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_name);
+        err = krb5int_ipc_stream_write_string (request, in_name);
     }
     
     if (!err) {
@@ -391,7 +391,7 @@ cc_int32 ccapi_context_open_ccache (cc_context_t  in_context,
                                        &reply);
     }
     
-    if (!err && !(k5_ipc_stream_size (reply) > 0)) {
+    if (!err && !(krb5int_ipc_stream_size (reply) > 0)) {
         err = ccErrCCacheNotFound;
     }
     
@@ -404,8 +404,8 @@ cc_int32 ccapi_context_open_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -434,7 +434,7 @@ cc_int32 ccapi_context_open_default_ccache (cc_context_t  in_context,
                                        &reply);
     }
     
-    if (!err && !(k5_ipc_stream_size (reply) > 0)) {
+    if (!err && !(krb5int_ipc_stream_size (reply) > 0)) {
         err = ccErrCCacheNotFound;
     }
     
@@ -447,7 +447,7 @@ cc_int32 ccapi_context_open_default_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -472,19 +472,19 @@ cc_int32 ccapi_context_create_ccache (cc_context_t  in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_name);
+        err = krb5int_ipc_stream_write_string (request, in_name);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_cred_vers);
+        err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
     
     if (!err) {
@@ -507,8 +507,8 @@ cc_int32 ccapi_context_create_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -531,15 +531,15 @@ cc_int32 ccapi_context_create_default_ccache (cc_context_t  in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_cred_vers);
+        err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
     
     if (!err) {
@@ -562,8 +562,8 @@ cc_int32 ccapi_context_create_default_ccache (cc_context_t  in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -586,15 +586,15 @@ cc_int32 ccapi_context_create_new_ccache (cc_context_t in_context,
     if (!out_ccache  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_cred_vers);
+        err = krb5int_ipc_stream_write_uint32 (request, in_cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_principal);
+        err = krb5int_ipc_stream_write_string (request, in_principal);
     }
     
     if (!err) {
@@ -617,8 +617,8 @@ cc_int32 ccapi_context_create_new_ccache (cc_context_t in_context,
     }
     
     cci_identifier_release (identifier);
-    k5_ipc_stream_release (reply);
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -648,7 +648,7 @@ cc_int32 ccapi_context_new_ccache_iterator (cc_context_t          in_context,
     }
     
     if (!err) {
-        if (k5_ipc_stream_size (reply) > 0) {
+        if (krb5int_ipc_stream_size (reply) > 0) {
             err = cci_identifier_read (&identifier, reply);
         } else {
             identifier = cci_identifier_uninitialized;
@@ -659,7 +659,7 @@ cc_int32 ccapi_context_new_ccache_iterator (cc_context_t          in_context,
         err = cci_ccache_iterator_new (out_iterator, identifier);
     }
 
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
 
     return cci_check_error (err);
@@ -678,15 +678,15 @@ cc_int32 ccapi_context_lock (cc_context_t in_context,
     if (!in_context) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_lock_type);
+        err = krb5int_ipc_stream_write_uint32 (request, in_lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (request, in_block);
+        err = krb5int_ipc_stream_write_uint32 (request, in_block);
     }
     
     if (!err) {
@@ -700,7 +700,7 @@ cc_int32 ccapi_context_lock (cc_context_t in_context,
                              NULL);
     }
     
-    k5_ipc_stream_release (request);
+    krb5int_ipc_stream_release (request);
     
     return cci_check_error (err);
 }
@@ -795,7 +795,7 @@ static cc_int32 cci_context_sync (cci_context_t in_context,
     }
     
     if (!err) {
-        if (k5_ipc_stream_size (reply) > 0) {
+        if (krb5int_ipc_stream_size (reply) > 0) {
             err = cci_identifier_read (&new_identifier, reply);
         } else {
             new_identifier = cci_identifier_uninitialized;
@@ -827,7 +827,7 @@ static cc_int32 cci_context_sync (cci_context_t in_context,
     }
         
     cci_identifier_release (new_identifier);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/ccapi_credentials_iterator.c b/src/ccapi/lib/ccapi_credentials_iterator.c
index 4571b64f84..59ffc7c647 100644
--- a/src/ccapi/lib/ccapi_credentials_iterator.c
+++ b/src/ccapi/lib/ccapi_credentials_iterator.c
@@ -168,7 +168,7 @@ cc_int32 ccapi_credentials_iterator_next (cc_credentials_iterator_t  in_credenti
         err = cci_credentials_read (out_credentials, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
@@ -201,7 +201,7 @@ cc_int32 ccapi_credentials_iterator_clone (cc_credentials_iterator_t  in_credent
         err = cci_credentials_iterator_new (out_credentials_iterator, identifier);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     cci_identifier_release (identifier);
     
     return cci_check_error (err);
diff --git a/src/ccapi/lib/ccapi_ipc.c b/src/ccapi/lib/ccapi_ipc.c
index 43993dc76d..8d8b2d209b 100644
--- a/src/ccapi/lib/ccapi_ipc.c
+++ b/src/ccapi/lib/ccapi_ipc.c
@@ -65,15 +65,15 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t  in_request_name,
     }
     
     if (!err && in_request_data) {
-        err = k5_ipc_stream_write (request, 
-                                k5_ipc_stream_data (in_request_data), 
-                                k5_ipc_stream_size (in_request_data));
+        err = krb5int_ipc_stream_write (request, 
+                                krb5int_ipc_stream_data (in_request_data), 
+                                krb5int_ipc_stream_size (in_request_data));
     }
     
     if (!err) {
         err = cci_os_ipc (in_launch_server, request, &reply);
 
-        if (!err && k5_ipc_stream_size (reply) > 0) {
+        if (!err && krb5int_ipc_stream_size (reply) > 0) {
             err = cci_message_read_reply_header (reply, &reply_error);
         }
     }
@@ -87,8 +87,8 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t  in_request_name,
         reply = NULL; /* take ownership */
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/lib/win/ccapi_os_ipc.cxx b/src/ccapi/lib/win/ccapi_os_ipc.cxx
index 6ccd59b9ab..b6fc70155c 100644
--- a/src/ccapi/lib/win/ccapi_os_ipc.cxx
+++ b/src/ccapi/lib/win/ccapi_os_ipc.cxx
@@ -207,8 +207,8 @@ extern "C" cc_int32 cci_os_ipc_msg( cc_int32        in_launch_server,
                 in_msg,                         /* Message type */
                 (unsigned char*)&ptspdata,      /* Our tspdata* will be sent back to the reply proc. */
                 (unsigned char*)uuid,
-                k5_ipc_stream_size(in_request_stream),
-                (unsigned char*)k5_ipc_stream_data(in_request_stream), /* Data buffer */
+                krb5int_ipc_stream_size(in_request_stream),
+                (unsigned char*)krb5int_ipc_stream_data(in_request_stream), /* Data buffer */
                 sst,                            /* session start time */
                 (long*)(&err) );                /* Return code */
             }
@@ -376,4 +376,4 @@ cc_int32 ccapi_connect(const struct tspdata* tsp) {
         } 
     
     return status;
-    }
\ No newline at end of file
+    }
diff --git a/src/ccapi/lib/win/ccs_reply_proc.c b/src/ccapi/lib/win/ccs_reply_proc.c
index 8eb3408367..b3ef3f7402 100644
--- a/src/ccapi/lib/win/ccs_reply_proc.c
+++ b/src/ccapi/lib/win/ccs_reply_proc.c
@@ -53,11 +53,11 @@ void ccs_rpc_request_reply(
     cci_debug_printf("%s! msg#:%d SST:%ld uuid:%s", __FUNCTION__, rpcmsg, srvStartTime, uuid);
 #endif
     if (!status) {                         
-        status = k5_ipc_stream_new (&stream);  /* Create a stream for the request data */
+        status = krb5int_ipc_stream_new (&stream);  /* Create a stream for the request data */
         }
 
     if (!status) {                          /* Put the data into the stream */
-        status = k5_ipc_stream_write (stream, chIn, cbIn);
+        status = krb5int_ipc_stream_write (stream, chIn, cbIn);
         }
 
     if (!status) {                          /* Put the data into the stream */
diff --git a/src/ccapi/lib/win/debug.exports b/src/ccapi/lib/win/debug.exports
index d7fbcc152d..7bf84d2722 100644
--- a/src/ccapi/lib/win/debug.exports
+++ b/src/ccapi/lib/win/debug.exports
@@ -3,9 +3,9 @@
     cci_os_ipc

     cci_os_ipc_msg

     cci_os_ipc_thread_init

-    k5_ipc_stream_data

-    k5_ipc_stream_write

-    k5_ipc_stream_new

+    krb5int_ipc_stream_data

+    krb5int_ipc_stream_write

+    krb5int_ipc_stream_new

     

     ccs_authenticate

     

diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c
index 3790a10aac..2137e816a6 100644
--- a/src/ccapi/server/ccs_cache_collection.c
+++ b/src/ccapi/server/ccs_cache_collection.c
@@ -152,11 +152,11 @@ cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collectio
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
 
     if (!err) {
-	err = k5_ipc_stream_write_time (reply_data, io_cache_collection->last_changed_time);
+	err = krb5int_ipc_stream_write_time (reply_data, io_cache_collection->last_changed_time);
     }
     
     if (!err) {
@@ -181,7 +181,7 @@ cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collectio
         err = ccs_os_notify_cache_collection_changed (io_cache_collection);
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
@@ -601,7 +601,7 @@ static cc_int32 ccs_cache_collection_get_change_time (ccs_cache_collection_t io_
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
+        err = krb5int_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
     }
     
     return cci_check_error (err);    
@@ -627,12 +627,12 @@ static cc_int32 ccs_cache_collection_wait_for_change (ccs_pipe_t              in
     if (!out_will_block                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
     }
     
     if (!err) {
 	if (last_wait_for_change_time < io_cache_collection->last_changed_time) {
-	    err = k5_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
+	    err = krb5int_ipc_stream_write_time (io_reply_data, io_cache_collection->last_changed_time);
 	
 	} else {
 	    ccs_callback_t callback = NULL;
@@ -690,7 +690,7 @@ static cc_int32 ccs_cache_collection_get_default_ccache_name (ccs_cache_collecti
                 err = ccs_ccache_write_name (ccache, io_reply_data);
             }
         } else {
-            err = k5_ipc_stream_write_string (io_reply_data, 
+            err = krb5int_ipc_stream_write_string (io_reply_data, 
                                            k_cci_context_initial_ccache_name);
         }
     }
@@ -713,7 +713,7 @@ static cc_int32 ccs_cache_collection_open_ccache (ccs_cache_collection_t io_cach
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &name);
+        err = krb5int_ipc_stream_read_string (in_request_data, &name);
     }
     
     if (!err) {
@@ -725,7 +725,7 @@ static cc_int32 ccs_cache_collection_open_ccache (ccs_cache_collection_t io_cach
         err = ccs_ccache_write (ccache, io_reply_data);
     }
     
-    k5_ipc_stream_free_string (name);
+    krb5int_ipc_stream_free_string (name);
         
     return cci_check_error (err);    
 }
@@ -772,15 +772,15 @@ static cc_int32 ccs_cache_collection_create_ccache (ccs_cache_collection_t io_ca
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &name);
+        err = krb5int_ipc_stream_read_string (in_request_data, &name);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -805,8 +805,8 @@ static cc_int32 ccs_cache_collection_create_ccache (ccs_cache_collection_t io_ca
         err = ccs_cache_collection_changed (io_cache_collection);
     }
     
-    k5_ipc_stream_free_string (name);
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (name);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);    
 }
@@ -827,11 +827,11 @@ static cc_int32 ccs_cache_collection_create_default_ccache (ccs_cache_collection
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -864,7 +864,7 @@ static cc_int32 ccs_cache_collection_create_default_ccache (ccs_cache_collection
         err = ccs_cache_collection_changed (io_cache_collection);
     }
     
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);    
 }
@@ -886,11 +886,11 @@ static cc_int32 ccs_cache_collection_create_new_ccache (ccs_cache_collection_t i
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -912,7 +912,7 @@ static cc_int32 ccs_cache_collection_create_new_ccache (ccs_cache_collection_t i
     }
     
     free (name);
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (principal);
     
     return cci_check_error (err);    
 }
@@ -964,11 +964,11 @@ static cc_int32 ccs_cache_collection_lock (ccs_pipe_t              in_client_pip
     if (!io_reply_data                  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &lock_type);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &block);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &block);
     }
     
     if (!err) {
@@ -1028,7 +1028,7 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t             in_client_pi
     if (!out_reply_data                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -1104,7 +1104,7 @@ static cc_int32 ccs_cache_collection_unlock (ccs_pipe_t             in_client_pi
         }
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c
index 88cf1e0d96..d7662343a3 100644
--- a/src/ccapi/server/ccs_ccache.c
+++ b/src/ccapi/server/ccs_ccache.c
@@ -335,11 +335,11 @@ cc_int32 ccs_ccache_changed (ccs_ccache_t           io_ccache,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
-	err = k5_ipc_stream_write_time (reply_data, io_ccache->last_changed_time);
+	err = krb5int_ipc_stream_write_time (reply_data, io_ccache->last_changed_time);
     }
 
     if (!err) {
@@ -365,7 +365,7 @@ cc_int32 ccs_ccache_changed (ccs_ccache_t           io_ccache,
                                             io_ccache->name);
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
@@ -487,7 +487,7 @@ cc_int32 ccs_ccache_write_name (ccs_ccache_t in_ccache,
     if (!io_stream) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, in_ccache->name);
+        err = krb5int_ipc_stream_write_string (io_stream, in_ccache->name);
     }
     
     return cci_check_error (err);    
@@ -562,7 +562,7 @@ static cc_int32 ccs_ccache_get_credentials_version (ccs_ccache_t           io_cc
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_uint32 (io_reply_data, io_ccache->creds_version);
+        err = krb5int_ipc_stream_write_uint32 (io_reply_data, io_ccache->creds_version);
     }
     
     return cci_check_error (err);    
@@ -583,7 +583,7 @@ static cc_int32 ccs_ccache_get_name (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_reply_data, io_ccache->name);
+        err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->name);
     }
     
     return cci_check_error (err);    
@@ -605,7 +605,7 @@ static cc_int32 ccs_ccache_get_principal (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &version);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &version);
     }
     
     if (!err && version == cc_credentials_v4_v5) {
@@ -614,10 +614,10 @@ static cc_int32 ccs_ccache_get_principal (ccs_ccache_t           io_ccache,
     
     if (!err) {
         if (version == cc_credentials_v4) {
-            err = k5_ipc_stream_write_string (io_reply_data, io_ccache->v4_principal);
+            err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->v4_principal);
             
         } else if (version == cc_credentials_v5) {
-            err = k5_ipc_stream_write_string (io_reply_data, io_ccache->v5_principal);
+            err = krb5int_ipc_stream_write_string (io_reply_data, io_ccache->v5_principal);
             
         } else {
             err = cci_check_error (ccErrBadCredentialsVersion);
@@ -644,11 +644,11 @@ static cc_int32 ccs_ccache_set_principal (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &version);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &version);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_data, &principal);
+        err = krb5int_ipc_stream_read_string (in_request_data, &principal);
     }
     
     if (!err) {
@@ -681,7 +681,7 @@ static cc_int32 ccs_ccache_set_principal (ccs_ccache_t           io_ccache,
         err = ccs_ccache_changed (io_ccache, io_cache_collection);
     }
     
-    k5_ipc_stream_free_string (principal);
+    krb5int_ipc_stream_free_string (principal);
         
     return cci_check_error (err);    
 }
@@ -834,11 +834,11 @@ static cc_int32 ccs_ccache_lock (ccs_pipe_t             in_client_pipe,
     if (!io_reply_data                  ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &lock_type);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &lock_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &block);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &block);
     }
     
     if (!err) {
@@ -892,7 +892,7 @@ static cc_int32 ccs_ccache_get_last_default_time (ccs_ccache_t           io_ccac
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_default_time);
+        err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_default_time);
     }
     
     return cci_check_error (err);    
@@ -913,7 +913,7 @@ static cc_int32 ccs_ccache_get_change_time (ccs_ccache_t           io_ccache,
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
+        err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
     }
     
     return cci_check_error (err);    
@@ -941,13 +941,13 @@ static cc_int32 ccs_ccache_wait_for_change (ccs_pipe_t              in_client_pi
     if (!out_will_block                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
+        err = krb5int_ipc_stream_read_time (in_request_data, &last_wait_for_change_time);
     }
     
     if (!err) {
 	if (last_wait_for_change_time < io_ccache->last_changed_time) {
 	    cci_debug_printf ("%s returning immediately", __FUNCTION__);
-	    err = k5_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
+	    err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->last_changed_time);
 	    
 	} else {
 	    ccs_callback_t callback = NULL;
@@ -995,20 +995,20 @@ static cc_int32 ccs_ccache_get_kdc_time_offset (ccs_ccache_t           io_ccache
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
         if (cred_vers == cc_credentials_v4) {
             if (io_ccache->kdc_time_offset_v4_valid) {
-                err = k5_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v4);
+                err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v4);
             } else {
                 err = cci_check_error (ccErrTimeOffsetNotSet);
             }
             
         } else if (cred_vers == cc_credentials_v5) {
             if (io_ccache->kdc_time_offset_v5_valid) {
-                err = k5_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v5);
+                err = krb5int_ipc_stream_write_time (io_reply_data, io_ccache->kdc_time_offset_v5);
             } else {
                 err = cci_check_error (ccErrTimeOffsetNotSet);
             }
@@ -1037,18 +1037,18 @@ static cc_int32 ccs_ccache_set_kdc_time_offset (ccs_ccache_t           io_ccache
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
         if (cred_vers == cc_credentials_v4) {
-            err = k5_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v4);
+            err = krb5int_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v4);
             
             if (!err) {
                 io_ccache->kdc_time_offset_v4_valid = 1;
             }
         } else if (cred_vers == cc_credentials_v5) {
-            err = k5_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v5);
+            err = krb5int_ipc_stream_read_time (in_request_data, &io_ccache->kdc_time_offset_v5);
             
             if (!err) {
                 io_ccache->kdc_time_offset_v5_valid = 1;
@@ -1081,7 +1081,7 @@ static cc_int32 ccs_ccache_clear_kdc_time_offset (ccs_ccache_t           io_ccac
     if (!io_reply_data      ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (in_request_data, &cred_vers);
+        err = krb5int_ipc_stream_read_uint32 (in_request_data, &cred_vers);
     }
     
     if (!err) {
@@ -1132,7 +1132,7 @@ cc_int32 ccs_ccache_handle_message (ccs_pipe_t              in_client_pipe,
     if (!out_reply_data                 ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -1231,7 +1231,7 @@ cc_int32 ccs_ccache_handle_message (ccs_pipe_t              in_client_pipe,
         }
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_ccache_iterator.c b/src/ccapi/server/ccs_ccache_iterator.c
index 0e05056440..fb007bf6ba 100644
--- a/src/ccapi/server/ccs_ccache_iterator.c
+++ b/src/ccapi/server/ccs_ccache_iterator.c
@@ -119,7 +119,7 @@ static  cc_int32 ccs_ccache_iterator_clone (ccs_ccache_iterator_t  io_ccache_ite
     if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -151,7 +151,7 @@ static  cc_int32 ccs_ccache_iterator_clone (ccs_ccache_iterator_t  io_ccache_ite
         reply_data = NULL; /* take ownership */
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_credentials_iterator.c b/src/ccapi/server/ccs_credentials_iterator.c
index 38e323c267..3ca7eeeea1 100644
--- a/src/ccapi/server/ccs_credentials_iterator.c
+++ b/src/ccapi/server/ccs_credentials_iterator.c
@@ -121,7 +121,7 @@ static  cc_int32 ccs_credentials_iterator_clone (ccs_credentials_iterator_t io_c
     if (!out_reply_data ) { err = cci_check_error (ccErrBadParam); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply_data);
+        err = krb5int_ipc_stream_new (&reply_data);
     }
     
     if (!err) {
@@ -153,7 +153,7 @@ static  cc_int32 ccs_credentials_iterator_clone (ccs_credentials_iterator_t io_c
         reply_data = NULL; /* take ownership */
     }
     
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);
 }
diff --git a/src/ccapi/server/ccs_server.c b/src/ccapi/server/ccs_server.c
index c1bbe539ad..30476e407e 100644
--- a/src/ccapi/server/ccs_server.c
+++ b/src/ccapi/server/ccs_server.c
@@ -366,7 +366,7 @@ cc_int32 ccs_server_handle_request (ccs_pipe_t     in_client_pipe,
     }
 
     cci_identifier_release (request_identifier);
-    k5_ipc_stream_release (reply_data);
+    krb5int_ipc_stream_release (reply_data);
     
     return cci_check_error (err);    
 }
@@ -386,17 +386,17 @@ cc_int32 ccs_server_send_reply (ccs_pipe_t     in_reply_pipe,
         err = cci_message_new_reply_header (&reply, in_reply_err);
     }
     
-    if (!err && in_reply_data && k5_ipc_stream_size (in_reply_data) > 0) {
-        err = k5_ipc_stream_write (reply, 
-                                k5_ipc_stream_data (in_reply_data), 
-                                k5_ipc_stream_size (in_reply_data));
+    if (!err && in_reply_data && krb5int_ipc_stream_size (in_reply_data) > 0) {
+        err = krb5int_ipc_stream_write (reply, 
+                                krb5int_ipc_stream_data (in_reply_data), 
+                                krb5int_ipc_stream_size (in_reply_data));
     }
     
     if (!err) {
         err = ccs_os_server_send_reply (in_reply_pipe, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return cci_check_error (err);    
 }
diff --git a/src/ccapi/server/win/WorkItem.cpp b/src/ccapi/server/win/WorkItem.cpp
index 2e9ebcc931..1b1725a8aa 100644
--- a/src/ccapi/server/win/WorkItem.cpp
+++ b/src/ccapi/server/win/WorkItem.cpp
@@ -53,17 +53,17 @@ WorkItem::WorkItem(k5_ipc_stream buf, WIN_PIPE* pipe, const long type, const lon
 WorkItem::WorkItem(const WorkItem& item) : _buf(NULL), _rpcmsg(0), _pipe(NULL), _sst(0) {

 

     k5_ipc_stream    _buf = NULL;

-    k5_ipc_stream_new(&_buf);

-    k5_ipc_stream_write(_buf, 

-                     k5_ipc_stream_data(item.payload()),

-                     k5_ipc_stream_size(item.payload()) );

+    krb5int_ipc_stream_new(&_buf);

+    krb5int_ipc_stream_write(_buf, 

+                     krb5int_ipc_stream_data(item.payload()),

+                     krb5int_ipc_stream_size(item.payload()) );

     WorkItem(_buf, item._pipe, item._rpcmsg, item._sst);

     }

 

 WorkItem::WorkItem() : _buf(NULL), _rpcmsg(CCMSG_INVALID), _pipe(NULL), _sst(0) { }

 

 WorkItem::~WorkItem() {

-    if (_buf)   k5_ipc_stream_release(_buf);

+    if (_buf)   krb5int_ipc_stream_release(_buf);

     if (_pipe)  ccs_win_pipe_release(_pipe);

     }

 

@@ -123,4 +123,4 @@ int WorkList::remove(WorkItem** item) {
         }

 

     return !bEmpty;

-    }
\ No newline at end of file
+    }

diff --git a/src/ccapi/server/win/ccs_os_server.cpp b/src/ccapi/server/win/ccs_os_server.cpp
index 99854d1139..e80a1c3aaa 100644
--- a/src/ccapi/server/win/ccs_os_server.cpp
+++ b/src/ccapi/server/win/ccs_os_server.cpp
@@ -279,8 +279,8 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
                             break;

                         case CCMSG_PING:

                             cci_debug_printf("  Processing PING");

-                            err = k5_ipc_stream_new  (&stream);

-                            err = k5_ipc_stream_write(stream, "This is a test of the emergency broadcasting system", 52);

+                            err = krb5int_ipc_stream_new  (&stream);

+                            err = krb5int_ipc_stream_write(stream, "This is a test of the emergency broadcasting system", 52);

                             err = ccs_os_server_send_reply(pipe, stream);

                             break;

                         default:

@@ -288,7 +288,7 @@ cc_int32 ccs_os_server_listen_loop (int argc, const char *argv[]) {
                                 rpcmsg, uuid);

                             break;

                         }

-                    if (buf)        k5_ipc_stream_release(buf);

+                    if (buf)        krb5int_ipc_stream_release(buf);

                     /* Don't free uuid, which was allocated here.  A pointer to it is in the 

                        rpcargs struct which was passed to connectionListener which will be

                        received by ccapi_listen when the client exits.  ccapi_listen needs 

@@ -333,8 +333,8 @@ cc_int32 ccs_os_server_send_reply (ccs_pipe_t   in_pipe,
                 (unsigned char*)&h,                 /* client's tspdata* */

                 (unsigned char*)uuid,

                 getMySST(),

-                k5_ipc_stream_size(in_reply_stream),   /* Length of buffer */

-                (const unsigned char*)k5_ipc_stream_data(in_reply_stream),   /* Data buffer */

+                krb5int_ipc_stream_size(in_reply_stream),   /* Length of buffer */

+                (const unsigned char*)krb5int_ipc_stream_data(in_reply_stream),   /* Data buffer */

                 &status );                          /* Return code */

             }

         RpcExcept(1) {

diff --git a/src/ccapi/server/win/ccs_request_proc.c b/src/ccapi/server/win/ccs_request_proc.c
index 8a0da03f4b..8421b72243 100644
--- a/src/ccapi/server/win/ccs_request_proc.c
+++ b/src/ccapi/server/win/ccs_request_proc.c
@@ -52,11 +52,11 @@ void ccs_rpc_request(
     status = (rpcmsg != CCMSG_REQUEST) && (rpcmsg != CCMSG_PING);
     
     if (!status) {                         
-        status = k5_ipc_stream_new (&stream);  /* Create a stream for the request data */
+        status = krb5int_ipc_stream_new (&stream);  /* Create a stream for the request data */
         }
 
     if (!status) {                          /* Put the data into the stream */
-        status = k5_ipc_stream_write (stream, pbRequest, lenRequest);
+        status = krb5int_ipc_stream_write (stream, pbRequest, lenRequest);
         }
 
     pipe = ccs_win_pipe_new(pszUUID, *p);    
@@ -112,4 +112,4 @@ CC_UINT32 ccs_authenticate(const CC_CHAR* name) {
 
     if (hMap) CloseHandle(hMap);
     return result;
-    }
\ No newline at end of file
+    }
diff --git a/src/include/k5-ipc_stream.h b/src/include/k5-ipc_stream.h
index 71bbaa1e77..680b763b05 100644
--- a/src/include/k5-ipc_stream.h
+++ b/src/include/k5-ipc_stream.h
@@ -33,45 +33,45 @@ struct k5_ipc_stream_s;
 typedef struct k5_ipc_stream_s *k5_ipc_stream;
 
 
-int32_t k5_ipc_stream_new (k5_ipc_stream *out_stream);
+int32_t krb5int_ipc_stream_new (k5_ipc_stream *out_stream);
 
-uint32_t k5_ipc_stream_release (k5_ipc_stream io_stream);
+uint32_t krb5int_ipc_stream_release (k5_ipc_stream io_stream);
 
-uint64_t k5_ipc_stream_size (k5_ipc_stream in_stream);
+uint64_t krb5int_ipc_stream_size (k5_ipc_stream in_stream);
 
-const char *k5_ipc_stream_data (k5_ipc_stream in_stream);
+const char *krb5int_ipc_stream_data (k5_ipc_stream in_stream);
 
-uint32_t k5_ipc_stream_read (k5_ipc_stream  in_stream, 
-                             void          *io_data,
-                             uint64_t       in_size);
-uint32_t k5_ipc_stream_write (k5_ipc_stream  in_stream, 
-                              const void    *in_data,
-                              uint64_t       in_size);
+uint32_t krb5int_ipc_stream_read (k5_ipc_stream  in_stream, 
+				  void          *io_data,
+				  uint64_t       in_size);
+uint32_t krb5int_ipc_stream_write (k5_ipc_stream  in_stream, 
+				   const void    *in_data,
+				   uint64_t       in_size);
 
-uint32_t k5_ipc_stream_read_string (k5_ipc_stream   io_stream, 
-                                    char          **out_string);
-uint32_t k5_ipc_stream_write_string (k5_ipc_stream  io_stream, 
-                                     const char    *in_string);
-void k5_ipc_stream_free_string (char *in_string);
+uint32_t krb5int_ipc_stream_read_string (k5_ipc_stream   io_stream, 
+					 char          **out_string);
+uint32_t krb5int_ipc_stream_write_string (k5_ipc_stream  io_stream, 
+					  const char    *in_string);
+void krb5int_ipc_stream_free_string (char *in_string);
 
-uint32_t k5_ipc_stream_read_int32 (k5_ipc_stream  io_stream, 
-                                   int32_t       *out_int32);
-uint32_t k5_ipc_stream_write_int32 (k5_ipc_stream io_stream, 
-                                    int32_t       in_int32);
+uint32_t krb5int_ipc_stream_read_int32 (k5_ipc_stream  io_stream, 
+					int32_t       *out_int32);
+uint32_t krb5int_ipc_stream_write_int32 (k5_ipc_stream io_stream, 
+					 int32_t       in_int32);
 
-uint32_t k5_ipc_stream_read_uint32 (k5_ipc_stream  io_stream, 
-                                    uint32_t      *out_uint32);
-uint32_t k5_ipc_stream_write_uint32 (k5_ipc_stream io_stream, 
-                                     uint32_t      in_uint32);
+uint32_t krb5int_ipc_stream_read_uint32 (k5_ipc_stream  io_stream, 
+					 uint32_t      *out_uint32);
+uint32_t krb5int_ipc_stream_write_uint32 (k5_ipc_stream io_stream, 
+					  uint32_t      in_uint32);
 
-uint32_t k5_ipc_stream_read_int64 (k5_ipc_stream  io_stream, 
-                                   int64_t       *out_int64);
-uint32_t k5_ipc_stream_write_int64 (k5_ipc_stream io_stream, 
-                                    int64_t       in_int64);
+uint32_t krb5int_ipc_stream_read_int64 (k5_ipc_stream  io_stream, 
+					int64_t       *out_int64);
+uint32_t krb5int_ipc_stream_write_int64 (k5_ipc_stream io_stream, 
+					 int64_t       in_int64);
 
-uint32_t k5_ipc_stream_read_uint64 (k5_ipc_stream  io_stream, 
-                                    uint64_t      *out_uint64);
-uint32_t k5_ipc_stream_write_uint64 (k5_ipc_stream io_stream, 
-                                     uint64_t      in_uint64);
+uint32_t krb5int_ipc_stream_read_uint64 (k5_ipc_stream  io_stream, 
+					 uint64_t      *out_uint64);
+uint32_t krb5int_ipc_stream_write_uint64 (k5_ipc_stream io_stream, 
+					  uint64_t      in_uint64);
 
 #endif /* K5_IPC_STREAM_H */
diff --git a/src/kim/agent/mac/ServerDemux.m b/src/kim/agent/mac/ServerDemux.m
index a2b0e6f8b6..25e321d1b0 100644
--- a/src/kim/agent/mac/ServerDemux.m
+++ b/src/kim/agent/mac/ServerDemux.m
@@ -76,15 +76,15 @@ static int32_t kim_handle_request_init (mach_port_t   in_client_port,
     bool isFrontProcess = 0;
 
     if (!err) {
-        err = k5_ipc_stream_read_int32 (in_request_stream, &pid);
+        err = krb5int_ipc_stream_read_int32 (in_request_stream, &pid);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &name);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &name);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &path);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &path);
     } 
     
     
@@ -101,8 +101,8 @@ static int32_t kim_handle_request_init (mach_port_t   in_client_port,
                                             path:path];
     }
     
-    k5_ipc_stream_free_string (name);    
-    k5_ipc_stream_free_string (path);
+    krb5int_ipc_stream_free_string (name);    
+    krb5int_ipc_stream_free_string (path);
 
     return err;   
 }
@@ -116,18 +116,18 @@ int32_t kim_handle_reply_init (mach_port_t   in_reply_port,
     k5_ipc_stream reply = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
     
     if (!err) {
         err = k5_ipc_server_send_reply (in_reply_port, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return err;   
 }
@@ -174,19 +174,19 @@ int32_t kim_handle_reply_enter_identity (mach_port_t   in_reply_port,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_string (reply, identity_string);
+        err = krb5int_ipc_stream_write_string (reply, identity_string);
     }
 
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_uint32 (reply, in_change_password);
+        err = krb5int_ipc_stream_write_uint32 (reply, in_change_password);
     }
     
     if (!err && !in_error) {
@@ -198,7 +198,7 @@ int32_t kim_handle_reply_enter_identity (mach_port_t   in_reply_port,
     }
     
     kim_string_free (&identity_string);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return err;   
 }
@@ -248,19 +248,19 @@ int32_t kim_handle_reply_select_identity (mach_port_t   in_reply_port,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_string (reply, identity_string);
+        err = krb5int_ipc_stream_write_string (reply, identity_string);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_uint32 (reply, in_change_password);
+        err = krb5int_ipc_stream_write_uint32 (reply, in_change_password);
     }
 
     if (!err && !in_error) {
@@ -272,7 +272,7 @@ int32_t kim_handle_reply_select_identity (mach_port_t   in_reply_port,
     }
     
     kim_string_free (&identity_string);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return err;   
 }
@@ -295,31 +295,31 @@ static int32_t kim_handle_request_auth_prompt (mach_port_t   in_client_port,
     char *description = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &identity_string);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &identity_string);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (in_request_stream, &type);
+        err = krb5int_ipc_stream_read_int32 (in_request_stream, &type);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (in_request_stream, &allow_save_reply);
+        err = krb5int_ipc_stream_read_int32 (in_request_stream, &allow_save_reply);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (in_request_stream, &hide_reply);
+        err = krb5int_ipc_stream_read_int32 (in_request_stream, &hide_reply);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &title);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &title);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &message);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &message);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &description);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &description);
     }    
     
     if (!err) {
@@ -335,10 +335,10 @@ static int32_t kim_handle_request_auth_prompt (mach_port_t   in_client_port,
                                                description:description];
     }
     
-    k5_ipc_stream_free_string (identity_string);    
-    k5_ipc_stream_free_string (title);    
-    k5_ipc_stream_free_string (message);    
-    k5_ipc_stream_free_string (description);    
+    krb5int_ipc_stream_free_string (identity_string);    
+    krb5int_ipc_stream_free_string (title);    
+    krb5int_ipc_stream_free_string (message);    
+    krb5int_ipc_stream_free_string (description);    
     
     return err;   
 }
@@ -354,26 +354,26 @@ int32_t kim_handle_reply_auth_prompt (mach_port_t   in_reply_port,
     k5_ipc_stream reply = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_string (reply, in_prompt_response);
+        err = krb5int_ipc_stream_write_string (reply, in_prompt_response);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_int32 (reply, in_allow_save_response);
+        err = krb5int_ipc_stream_write_int32 (reply, in_allow_save_response);
     }
     
     if (!err) {
         err = k5_ipc_server_send_reply (in_reply_port, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return err;   
 }
@@ -391,11 +391,11 @@ static int32_t kim_handle_request_change_password (mach_port_t   in_client_port,
     int32_t old_password_expired = 0;
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &identity_string);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &identity_string);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (in_request_stream, 
+        err = krb5int_ipc_stream_read_int32 (in_request_stream, 
                                         &old_password_expired);
     }    
     
@@ -407,7 +407,7 @@ static int32_t kim_handle_request_change_password (mach_port_t   in_client_port,
                                                     expired:old_password_expired];
     }
     
-    k5_ipc_stream_free_string (identity_string);   
+    krb5int_ipc_stream_free_string (identity_string);   
     
     return err;   
 }
@@ -424,30 +424,30 @@ int32_t kim_handle_reply_change_password (mach_port_t   in_reply_port,
     k5_ipc_stream reply = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_string (reply, in_old_password);
+        err = krb5int_ipc_stream_write_string (reply, in_old_password);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_string (reply, in_new_password);
+        err = krb5int_ipc_stream_write_string (reply, in_new_password);
     }
     
     if (!err && !in_error) {
-        err = k5_ipc_stream_write_string (reply, in_vfy_password);
+        err = krb5int_ipc_stream_write_string (reply, in_vfy_password);
     }
     
     if (!err) {
         err = k5_ipc_server_send_reply (in_reply_port, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return err;   
 }
@@ -467,24 +467,24 @@ static int32_t kim_handle_request_handle_error (mach_port_t   in_client_port,
     char *description = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &identity_string);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &identity_string);
         /* Can be empty string "" if there is no identity */
         if (!err && !identity_string[0]) {
-            k5_ipc_stream_free_string (identity_string);   
+            krb5int_ipc_stream_free_string (identity_string);   
             identity_string = NULL;
         }
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (in_request_stream, &error);
+        err = krb5int_ipc_stream_read_int32 (in_request_stream, &error);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &message);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &message);
     }    
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &description);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &description);
     }    
     
     if (!err) {
@@ -497,9 +497,9 @@ static int32_t kim_handle_request_handle_error (mach_port_t   in_client_port,
                                              description:description];
     }
     
-    k5_ipc_stream_free_string (identity_string);   
-    k5_ipc_stream_free_string (message);   
-    k5_ipc_stream_free_string (description);   
+    krb5int_ipc_stream_free_string (identity_string);   
+    krb5int_ipc_stream_free_string (message);   
+    krb5int_ipc_stream_free_string (description);   
     
     return err;   
 }
@@ -513,18 +513,18 @@ int32_t kim_handle_reply_handle_error (mach_port_t   in_reply_port,
     k5_ipc_stream reply = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
 
     if (!err) {
         err = k5_ipc_server_send_reply (in_reply_port, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return err;   
 }
@@ -553,18 +553,18 @@ int32_t kim_handle_reply_fini (mach_port_t   in_reply_port,
     k5_ipc_stream reply = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_new (&reply);
+        err = krb5int_ipc_stream_new (&reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (reply, in_error);
+        err = krb5int_ipc_stream_write_int32 (reply, in_error);
     }
     
     if (!err) {
         err = k5_ipc_server_send_reply (in_reply_port, reply);
     }
     
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (reply);
     
     return err;   
 }
@@ -609,7 +609,7 @@ int32_t k5_ipc_server_handle_request (mach_port_t   in_client_port,
     char *message_type = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_read_string (in_request_stream, &message_type);
+        err = krb5int_ipc_stream_read_string (in_request_stream, &message_type);
     }
     
     if (!err) {
@@ -653,7 +653,7 @@ int32_t k5_ipc_server_handle_request (mach_port_t   in_client_port,
         }
     }
     
-    k5_ipc_stream_free_string (message_type);
+    krb5int_ipc_stream_free_string (message_type);
     
     return err;
 }
diff --git a/src/kim/lib/kim_options.c b/src/kim/lib/kim_options.c
index 5d7e58ae5f..5c45fb35a8 100644
--- a/src/kim/lib/kim_options.c
+++ b/src/kim/lib/kim_options.c
@@ -545,36 +545,36 @@ kim_error kim_options_write_to_stream (kim_options   in_options,
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int64 (io_stream, options->start_time);
+        err = krb5int_ipc_stream_write_int64 (io_stream, options->start_time);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int64 (io_stream, options->lifetime);
+        err = krb5int_ipc_stream_write_int64 (io_stream, options->lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, options->renewable);
+        err = krb5int_ipc_stream_write_int32 (io_stream, options->renewable);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int64 (io_stream, 
+        err = krb5int_ipc_stream_write_int64 (io_stream, 
                                          options->renewal_lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, options->forwardable);
+        err = krb5int_ipc_stream_write_int32 (io_stream, options->forwardable);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, options->proxiable);
+        err = krb5int_ipc_stream_write_int32 (io_stream, options->proxiable);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (io_stream, options->addressless);
+        err = krb5int_ipc_stream_write_int32 (io_stream, options->addressless);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream,  options->service_name);
+        err = krb5int_ipc_stream_write_string (io_stream,  options->service_name);
     }
     
     if (options != in_options) { kim_options_free (&options); }
@@ -593,37 +593,37 @@ kim_error kim_options_read_from_stream (kim_options    io_options,
     if (!err && !io_stream ) { err = check_error (KIM_NULL_PARAMETER_ERR); }
     
     if (!err) {
-        err = k5_ipc_stream_read_int64 (io_stream, &io_options->start_time);
+        err = krb5int_ipc_stream_read_int64 (io_stream, &io_options->start_time);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int64 (io_stream, &io_options->lifetime);
+        err = krb5int_ipc_stream_read_int64 (io_stream, &io_options->lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &io_options->renewable);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &io_options->renewable);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int64 (io_stream, 
+        err = krb5int_ipc_stream_read_int64 (io_stream, 
                                         &io_options->renewal_lifetime);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &io_options->forwardable);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &io_options->forwardable);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &io_options->proxiable);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &io_options->proxiable);
     }
     
     if (!err) {
-        err = k5_ipc_stream_read_int32 (io_stream, &io_options->addressless);
+        err = krb5int_ipc_stream_read_int32 (io_stream, &io_options->addressless);
     }
     
     if (!err) {
         char *service_name = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &service_name);
+        err = krb5int_ipc_stream_read_string (io_stream, &service_name);
         
         if (!err) {
             kim_string_free (&io_options->service_name);
@@ -634,7 +634,7 @@ kim_error kim_options_read_from_stream (kim_options    io_options,
             }
         }
         
-        k5_ipc_stream_free_string (service_name);
+        krb5int_ipc_stream_free_string (service_name);
     }
     
     return check_error (err);    
diff --git a/src/kim/lib/kim_selection_hints.c b/src/kim/lib/kim_selection_hints.c
index 2b57428300..3704d87e99 100644
--- a/src/kim/lib/kim_selection_hints.c
+++ b/src/kim/lib/kim_selection_hints.c
@@ -593,13 +593,13 @@ kim_error kim_selection_hints_write_to_stream (kim_selection_hints in_selection_
     if (!err && !io_stream         ) { err = check_error (KIM_NULL_PARAMETER_ERR); }
 
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, 
-                                          in_selection_hints->application_identifier);
+        err = krb5int_ipc_stream_write_string (io_stream, 
+					       in_selection_hints->application_identifier);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, 
-                                          in_selection_hints->explanation);
+        err = krb5int_ipc_stream_write_string (io_stream, 
+					       in_selection_hints->explanation);
     }
     
     if (!err) {
@@ -608,33 +608,33 @@ kim_error kim_selection_hints_write_to_stream (kim_selection_hints in_selection_
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, 
-                                          in_selection_hints->service_identity);
+        err = krb5int_ipc_stream_write_string (io_stream, 
+					       in_selection_hints->service_identity);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, 
-                                          in_selection_hints->client_realm);
+        err = krb5int_ipc_stream_write_string (io_stream, 
+					       in_selection_hints->client_realm);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, 
-                                          in_selection_hints->user);
+        err = krb5int_ipc_stream_write_string (io_stream, 
+					       in_selection_hints->user);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, 
-                                          in_selection_hints->service_realm);
+        err = krb5int_ipc_stream_write_string (io_stream, 
+					       in_selection_hints->service_realm);
     }
     
     if (!err) {
-       err = k5_ipc_stream_write_string (io_stream, 
-                                         in_selection_hints->service);
+       err = krb5int_ipc_stream_write_string (io_stream, 
+					      in_selection_hints->service);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (io_stream, 
-                                          in_selection_hints->server);
+        err = krb5int_ipc_stream_write_string (io_stream, 
+					       in_selection_hints->server);
     }
     
     return check_error (err);    
@@ -652,26 +652,26 @@ kim_error kim_selection_hints_read_from_stream (kim_selection_hints io_selection
     
     if (!err) {
         char *application_identifier = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &application_identifier);
+        err = krb5int_ipc_stream_read_string (io_stream, &application_identifier);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->application_identifier, 
                                    application_identifier);
         }
         
-        k5_ipc_stream_free_string (application_identifier);
+        krb5int_ipc_stream_free_string (application_identifier);
     }
     
     if (!err) {
         char *explanation = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &explanation);
+        err = krb5int_ipc_stream_read_string (io_stream, &explanation);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->explanation, 
                                    explanation);
         }
         
-        k5_ipc_stream_free_string (explanation);
+        krb5int_ipc_stream_free_string (explanation);
     }
     
     if (!err) {
@@ -686,71 +686,71 @@ kim_error kim_selection_hints_read_from_stream (kim_selection_hints io_selection
     
     if (!err) {
         char *service_identity = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &service_identity);
+        err = krb5int_ipc_stream_read_string (io_stream, &service_identity);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->service_identity, 
                                    service_identity);
         }
         
-        k5_ipc_stream_free_string (service_identity);
+        krb5int_ipc_stream_free_string (service_identity);
     }
     
     if (!err) {
         char *client_realm = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &client_realm);
+        err = krb5int_ipc_stream_read_string (io_stream, &client_realm);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->client_realm, 
                                    client_realm);
         }
         
-        k5_ipc_stream_free_string (client_realm);
+        krb5int_ipc_stream_free_string (client_realm);
     }
     
     if (!err) {
         char *user = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &user);
+        err = krb5int_ipc_stream_read_string (io_stream, &user);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->user, user);
         }
         
-        k5_ipc_stream_free_string (user);
+        krb5int_ipc_stream_free_string (user);
     }
     
     if (!err) {
         char *service_realm = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &service_realm);
+        err = krb5int_ipc_stream_read_string (io_stream, &service_realm);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->service_realm, 
                                    service_realm);
         }
         
-        k5_ipc_stream_free_string (service_realm);
+        krb5int_ipc_stream_free_string (service_realm);
     }
     
     if (!err) {
         char *service = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &service);
+        err = krb5int_ipc_stream_read_string (io_stream, &service);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->service, service);
         }
         
-        k5_ipc_stream_free_string (service);
+        krb5int_ipc_stream_free_string (service);
     }
     
     if (!err) {
         char *server = NULL;
-        err = k5_ipc_stream_read_string (io_stream, &server);
+        err = krb5int_ipc_stream_read_string (io_stream, &server);
         
         if (!err) {
             err = kim_string_copy (&io_selection_hints->server, server);
         }
         
-        k5_ipc_stream_free_string (server);
+        krb5int_ipc_stream_free_string (server);
     }
     
     return check_error (err);    
diff --git a/src/kim/lib/mac/kim_os_ui_gui.c b/src/kim/lib/mac/kim_os_ui_gui.c
index 6e1c5cef1e..1f9122570c 100644
--- a/src/kim/lib/mac/kim_os_ui_gui.c
+++ b/src/kim/lib/mac/kim_os_ui_gui.c
@@ -68,23 +68,23 @@ kim_error kim_os_ui_gui_init (kim_ui_context *io_context)
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, "init");
+        err = krb5int_ipc_stream_write_string (request, "init");
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (request, getpid());
+        err = krb5int_ipc_stream_write_int32 (request, getpid());
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, name ? name : "");
+        err = krb5int_ipc_stream_write_string (request, name ? name : "");
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, path ? path : "");
+        err = krb5int_ipc_stream_write_string (request, path ? path : "");
     }
     
     if (!err) {
@@ -96,7 +96,7 @@ kim_error kim_os_ui_gui_init (kim_ui_context *io_context)
     if (!err) {
         int32_t result = 0;
 
-        err = k5_ipc_stream_read_int32 (reply, &result);
+        err = krb5int_ipc_stream_read_int32 (reply, &result);
         if (!err) { err = check_error (result); }
     }
     
@@ -104,8 +104,8 @@ kim_error kim_os_ui_gui_init (kim_ui_context *io_context)
         io_context->tcontext = NULL;
     }
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     kim_string_free (&name);
     kim_string_free (&path);
     
@@ -131,11 +131,11 @@ kim_error kim_os_ui_gui_enter_identity (kim_ui_context *in_context,
     if (!err && !out_change_password) { err = check_error (KIM_NULL_PARAMETER_ERR); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, "enter_identity");
+        err = krb5int_ipc_stream_write_string (request, "enter_identity");
     }
 
     if (!err) {
@@ -152,16 +152,16 @@ kim_error kim_os_ui_gui_enter_identity (kim_ui_context *in_context,
     if (!err) {
         int32_t result = 0;
         
-        err = k5_ipc_stream_read_int32 (reply, &result);
+        err = krb5int_ipc_stream_read_int32 (reply, &result);
         if (!err) { err = check_error (result); }
     }
     
     if (!err) {
-        err  = k5_ipc_stream_read_string (reply, &identity_string);
+        err  = krb5int_ipc_stream_read_string (reply, &identity_string);
     }
 
     if (!err) {
-        err  = k5_ipc_stream_read_uint32 (reply, &change_password);
+        err  = krb5int_ipc_stream_read_uint32 (reply, &change_password);
     }
     
     if (!err) {
@@ -179,9 +179,9 @@ kim_error kim_os_ui_gui_enter_identity (kim_ui_context *in_context,
     }
     
     kim_identity_free (&identity);
-    k5_ipc_stream_free_string (identity_string);
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (identity_string);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
 
     return check_error (err);
 }
@@ -206,11 +206,11 @@ kim_error kim_os_ui_gui_select_identity (kim_ui_context      *in_context,
     if (!err && !out_change_password) { err = check_error (KIM_NULL_PARAMETER_ERR); }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, "select_identity");
+        err = krb5int_ipc_stream_write_string (request, "select_identity");
     }
     
     if (!err) {
@@ -227,12 +227,12 @@ kim_error kim_os_ui_gui_select_identity (kim_ui_context      *in_context,
     if (!err) {
         int32_t result = 0;
         
-        err = k5_ipc_stream_read_int32 (reply, &result);
+        err = krb5int_ipc_stream_read_int32 (reply, &result);
         if (!err) { err = check_error (result); }
     }
     
     if (!err) {
-        err  = k5_ipc_stream_read_string (reply, &identity_string);
+        err  = krb5int_ipc_stream_read_string (reply, &identity_string);
     }
     
     if (!err) {
@@ -240,7 +240,7 @@ kim_error kim_os_ui_gui_select_identity (kim_ui_context      *in_context,
     }
     
     if (!err) {
-        err  = k5_ipc_stream_read_uint32 (reply, &change_password);
+        err  = krb5int_ipc_stream_read_uint32 (reply, &change_password);
     }
 
     if (!err) {
@@ -259,9 +259,9 @@ kim_error kim_os_ui_gui_select_identity (kim_ui_context      *in_context,
     
     kim_identity_free (&identity);    
     kim_options_free (&options);
-    k5_ipc_stream_free_string (identity_string);    
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_free_string (identity_string);    
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
     
     return check_error (err);
 }
@@ -293,41 +293,41 @@ kim_error kim_os_ui_gui_auth_prompt (kim_ui_context      *in_context,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, "auth_prompt");
+        err = krb5int_ipc_stream_write_string (request, "auth_prompt");
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, identity_string);
+        err = krb5int_ipc_stream_write_string (request, identity_string);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (request, in_type);
+        err = krb5int_ipc_stream_write_int32 (request, in_type);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (request, in_allow_save_reply);
+        err = krb5int_ipc_stream_write_int32 (request, in_allow_save_reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (request, in_hide_reply);
+        err = krb5int_ipc_stream_write_int32 (request, in_hide_reply);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, 
+        err = krb5int_ipc_stream_write_string (request, 
                                           in_title ? in_title : "");
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, 
+        err = krb5int_ipc_stream_write_string (request, 
                                           in_message ? in_message : "");
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, 
+        err = krb5int_ipc_stream_write_string (request, 
                                           in_description ? in_description : "");
     }
     
@@ -341,22 +341,22 @@ kim_error kim_os_ui_gui_auth_prompt (kim_ui_context      *in_context,
     if (!err) {
         int32_t result = 0;
         
-        err = k5_ipc_stream_read_int32 (reply, &result);
+        err = krb5int_ipc_stream_read_int32 (reply, &result);
         if (!err) { err = check_error (result); }
     }
     
     if (!err) {
-        err  = k5_ipc_stream_read_string (reply, out_reply);
+        err  = krb5int_ipc_stream_read_string (reply, out_reply);
     } 
     
     if (!err) {
-        err  = k5_ipc_stream_read_int32 (reply, out_save_reply);
+        err  = krb5int_ipc_stream_read_int32 (reply, out_save_reply);
     } 
     
     kim_string_free (&identity_string);
 
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
 
     return check_error (err);
 }
@@ -389,19 +389,19 @@ kim_error kim_os_ui_gui_change_password (kim_ui_context      *in_context,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, "change_password");
+        err = krb5int_ipc_stream_write_string (request, "change_password");
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, identity_string);
+        err = krb5int_ipc_stream_write_string (request, identity_string);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (request, in_old_password_expired);
+        err = krb5int_ipc_stream_write_int32 (request, in_old_password_expired);
     }
     
     if (!err) {
@@ -414,20 +414,20 @@ kim_error kim_os_ui_gui_change_password (kim_ui_context      *in_context,
     if (!err) {
         int32_t result = 0;
         
-        err = k5_ipc_stream_read_int32 (reply, &result);
+        err = krb5int_ipc_stream_read_int32 (reply, &result);
         if (!err) { err = check_error (result); }
     }
     
     if (!err) {
-        err  = k5_ipc_stream_read_string (reply, &old_password);
+        err  = krb5int_ipc_stream_read_string (reply, &old_password);
     }     
     
     if (!err) {
-        err  = k5_ipc_stream_read_string (reply, &new_password);
+        err  = krb5int_ipc_stream_read_string (reply, &new_password);
     }     
     
     if (!err) {
-        err  = k5_ipc_stream_read_string (reply, &vfy_password);
+        err  = krb5int_ipc_stream_read_string (reply, &vfy_password);
     }     
     
     if (!err) {
@@ -440,12 +440,12 @@ kim_error kim_os_ui_gui_change_password (kim_ui_context      *in_context,
     }
     
     kim_string_free (&identity_string);    
-    k5_ipc_stream_free_string (old_password);    
-    k5_ipc_stream_free_string (new_password);    
-    k5_ipc_stream_free_string (vfy_password);    
+    krb5int_ipc_stream_free_string (old_password);    
+    krb5int_ipc_stream_free_string (new_password);    
+    krb5int_ipc_stream_free_string (vfy_password);    
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
 
     return check_error (err);
 }
@@ -471,27 +471,27 @@ kim_error kim_os_ui_gui_handle_error (kim_ui_context    *in_context,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, "handle_error");
+        err = krb5int_ipc_stream_write_string (request, "handle_error");
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, identity_string);
+        err = krb5int_ipc_stream_write_string (request, identity_string);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_int32 (request, in_error);
+        err = krb5int_ipc_stream_write_int32 (request, in_error);
     }
 
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_error_message);
+        err = krb5int_ipc_stream_write_string (request, in_error_message);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, in_error_description);
+        err = krb5int_ipc_stream_write_string (request, in_error_description);
     }
     
     if (!err) {
@@ -504,14 +504,14 @@ kim_error kim_os_ui_gui_handle_error (kim_ui_context    *in_context,
     if (!err) {
         int32_t result = 0;
         
-        err = k5_ipc_stream_read_int32 (reply, &result);
+        err = krb5int_ipc_stream_read_int32 (reply, &result);
         if (!err) { err = check_error (result); }
     }
     
     kim_string_free (&identity_string);    
 
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
 
     return check_error (err);
 }
@@ -533,11 +533,11 @@ kim_error kim_os_ui_gui_fini (kim_ui_context *io_context)
     k5_ipc_stream reply = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_new (&request);
+        err = krb5int_ipc_stream_new (&request);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write_string (request, "fini");
+        err = krb5int_ipc_stream_write_string (request, "fini");
     }
     
     if (!err) {
@@ -550,12 +550,12 @@ kim_error kim_os_ui_gui_fini (kim_ui_context *io_context)
     if (!err) {
         int32_t result = 0;
         
-        err = k5_ipc_stream_read_int32 (reply, &result);
+        err = krb5int_ipc_stream_read_int32 (reply, &result);
         if (!err) { err = check_error (result); }
     }    
     
-    k5_ipc_stream_release (request);
-    k5_ipc_stream_release (reply);
+    krb5int_ipc_stream_release (request);
+    krb5int_ipc_stream_release (reply);
 
     return check_error (err);
 }
diff --git a/src/util/mac/k5_mig_client.c b/src/util/mac/k5_mig_client.c
index 7dedbbebb5..603ffdc70f 100644
--- a/src/util/mac/k5_mig_client.c
+++ b/src/util/mac/k5_mig_client.c
@@ -325,12 +325,12 @@ kern_return_t k5_ipc_client_reply (mach_port_t             in_reply_port,
     
     if (!err) {
         if (in_inl_replyCnt) {
-            err = k5_ipc_stream_write (cinfo->reply_stream, 
-                                       in_inl_reply, in_inl_replyCnt);
+            err = krb5int_ipc_stream_write (cinfo->reply_stream, 
+					    in_inl_reply, in_inl_replyCnt);
             
         } else if (in_ool_replyCnt) {
-            err = k5_ipc_stream_write (cinfo->reply_stream, 
-                                       in_ool_reply, in_ool_replyCnt);
+            err = krb5int_ipc_stream_write (cinfo->reply_stream, 
+					    in_ool_reply, in_ool_replyCnt);
             
         } else {
             err = EINVAL;
@@ -375,14 +375,14 @@ int32_t k5_ipc_send_request (const char    *in_service_id,
     if (!err) {
         /* depending on how big the message is, use the fast inline buffer or  
          * the slow dynamically allocated buffer */
-        mach_msg_type_number_t request_length = k5_ipc_stream_size (in_request_stream);
+        mach_msg_type_number_t request_length = krb5int_ipc_stream_size (in_request_stream);
         
         if (request_length > K5_IPC_MAX_INL_MSG_SIZE) {
             /*dprintf ("%s choosing out of line buffer (size is %d)", 
              *                  __FUNCTION__, request_length); */
             
             err = vm_read (mach_task_self (), 
-                           (vm_address_t) k5_ipc_stream_data (in_request_stream), 
+                           (vm_address_t) krb5int_ipc_stream_data (in_request_stream), 
                            request_length, 
                            (vm_address_t *) &ool_request, 
                            &ool_request_length);        
@@ -391,7 +391,7 @@ int32_t k5_ipc_send_request (const char    *in_service_id,
              *                  __FUNCTION__, request_length); */
             
             inl_request_length = request_length;
-            inl_request = k5_ipc_stream_data (in_request_stream);
+            inl_request = krb5int_ipc_stream_data (in_request_stream);
         }
     }
 
@@ -473,7 +473,7 @@ int32_t k5_ipc_send_request (const char    *in_service_id,
     }
     
     if (!err) {
-        err = k5_ipc_stream_new (&cinfo->reply_stream);
+        err = krb5int_ipc_stream_new (&cinfo->reply_stream);
     }
     
     if (!err) {
@@ -519,7 +519,7 @@ int32_t k5_ipc_send_request (const char    *in_service_id,
                        (vm_address_t) ool_request, ool_request_length); 
     }
     if (cinfo && cinfo->reply_stream) { 
-        k5_ipc_stream_release (cinfo->reply_stream); 
+        krb5int_ipc_stream_release (cinfo->reply_stream); 
         cinfo->reply_stream = NULL;
     }
     
diff --git a/src/util/mac/k5_mig_server.c b/src/util/mac/k5_mig_server.c
index 45f1b31afb..03a7a81306 100644
--- a/src/util/mac/k5_mig_server.c
+++ b/src/util/mac/k5_mig_server.c
@@ -136,15 +136,15 @@ kern_return_t k5_ipc_server_request (mach_port_t             in_connection_port,
     k5_ipc_stream request_stream = NULL;
     
     if (!err) {
-        err = k5_ipc_stream_new (&request_stream);
+        err = krb5int_ipc_stream_new (&request_stream);
     }
     
     if (!err) {
         if (in_inl_requestCnt) {
-            err = k5_ipc_stream_write (request_stream, in_inl_request, in_inl_requestCnt);
+            err = krb5int_ipc_stream_write (request_stream, in_inl_request, in_inl_requestCnt);
             
         } else if (in_ool_requestCnt) {
-            err = k5_ipc_stream_write (request_stream, in_ool_request, in_ool_requestCnt);
+            err = krb5int_ipc_stream_write (request_stream, in_ool_request, in_ool_requestCnt);
             
         } else {
             err = EINVAL;
@@ -155,7 +155,7 @@ kern_return_t k5_ipc_server_request (mach_port_t             in_connection_port,
         err = k5_ipc_server_handle_request (in_connection_port, in_reply_port, request_stream);
     }
     
-    k5_ipc_stream_release (request_stream);
+    krb5int_ipc_stream_release (request_stream);
     if (in_ool_requestCnt) { vm_deallocate (mach_task_self (), (vm_address_t) in_ool_request, in_ool_requestCnt); }
     
     return err;
@@ -346,14 +346,14 @@ int32_t k5_ipc_server_send_reply (mach_port_t   in_reply_port,
     if (!err) {
         /* depending on how big the message is, use the fast inline buffer or  
          * the slow dynamically allocated buffer */
-        mach_msg_type_number_t reply_length = k5_ipc_stream_size (in_reply_stream);
+        mach_msg_type_number_t reply_length = krb5int_ipc_stream_size (in_reply_stream);
         
         if (reply_length > K5_IPC_MAX_INL_MSG_SIZE) {            
             //dprintf ("%s choosing out of line buffer (size is %d)", 
             //                  __FUNCTION__, reply_length);
             
             err = vm_read (mach_task_self (), 
-                           (vm_address_t) k5_ipc_stream_data (in_reply_stream), reply_length, 
+                           (vm_address_t) krb5int_ipc_stream_data (in_reply_stream), reply_length, 
                            (vm_address_t *) &ool_reply, &ool_reply_length);
             
         } else {
@@ -361,7 +361,7 @@ int32_t k5_ipc_server_send_reply (mach_port_t   in_reply_port,
             //                  __FUNCTION__, reply_length);
             
             inl_reply_length = reply_length;
-            memcpy (inl_reply, k5_ipc_stream_data (in_reply_stream), reply_length);
+            memcpy (inl_reply, krb5int_ipc_stream_data (in_reply_stream), reply_length);
         }
     }
     
diff --git a/src/util/support/ipc_stream.c b/src/util/support/ipc_stream.c
index 3da2cbc01b..92d47e6ec1 100644
--- a/src/util/support/ipc_stream.c
+++ b/src/util/support/ipc_stream.c
@@ -52,8 +52,8 @@ static const struct k5_ipc_stream_s k5_ipc_stream_initializer = { NULL, 0, 0 };
 
 /* ------------------------------------------------------------------------ */
 
-static uint32_t k5_ipc_stream_reallocate (k5_ipc_stream io_stream,
-                                          uint64_t      in_new_size)
+static uint32_t krb5int_ipc_stream_reallocate (k5_ipc_stream io_stream,
+					       uint64_t      in_new_size)
 {
     int32_t err = 0;
     uint64_t new_max_size = 0;
@@ -102,7 +102,7 @@ static uint32_t k5_ipc_stream_reallocate (k5_ipc_stream io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-int32_t k5_ipc_stream_new (k5_ipc_stream *out_stream)
+int32_t krb5int_ipc_stream_new (k5_ipc_stream *out_stream)
 {
     int32_t err = 0;
     k5_ipc_stream stream = NULL;
@@ -123,7 +123,7 @@ int32_t k5_ipc_stream_new (k5_ipc_stream *out_stream)
         stream = NULL;
     }
     
-    k5_ipc_stream_release (stream);
+    krb5int_ipc_stream_release (stream);
     
     return k5_check_error (err);    
 }
@@ -131,7 +131,7 @@ int32_t k5_ipc_stream_new (k5_ipc_stream *out_stream)
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_release (k5_ipc_stream io_stream)
+uint32_t krb5int_ipc_stream_release (k5_ipc_stream io_stream)
 {	
     int32_t err = 0;
     
@@ -145,7 +145,7 @@ uint32_t k5_ipc_stream_release (k5_ipc_stream io_stream)
 
 /* ------------------------------------------------------------------------ */
 
-uint64_t k5_ipc_stream_size (k5_ipc_stream in_stream)
+uint64_t krb5int_ipc_stream_size (k5_ipc_stream in_stream)
 {
     return in_stream ? in_stream->size : 0;
 }
@@ -153,7 +153,7 @@ uint64_t k5_ipc_stream_size (k5_ipc_stream in_stream)
 
 /* ------------------------------------------------------------------------ */
 
-const char *k5_ipc_stream_data (k5_ipc_stream in_stream)
+const char *krb5int_ipc_stream_data (k5_ipc_stream in_stream)
 {
     return in_stream ? in_stream->data : NULL;
 }
@@ -164,9 +164,9 @@ const char *k5_ipc_stream_data (k5_ipc_stream in_stream)
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_read (k5_ipc_stream  io_stream, 
-                             void         *io_data, 
-                             uint64_t     in_size)
+uint32_t krb5int_ipc_stream_read (k5_ipc_stream  io_stream, 
+				  void         *io_data, 
+				  uint64_t     in_size)
 {
     int32_t err = 0;
     
@@ -184,7 +184,7 @@ uint32_t k5_ipc_stream_read (k5_ipc_stream  io_stream,
         memmove (io_stream->data, &io_stream->data[in_size], 
                  io_stream->size - in_size);
         
-        err = k5_ipc_stream_reallocate (io_stream, io_stream->size - in_size);
+        err = krb5int_ipc_stream_reallocate (io_stream, io_stream->size - in_size);
         
         if (!err) {
             io_stream->size -= in_size;
@@ -196,9 +196,9 @@ uint32_t k5_ipc_stream_read (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_write (k5_ipc_stream  io_stream,
-                              const void   *in_data, 
-                              uint64_t     in_size)
+uint32_t krb5int_ipc_stream_write (k5_ipc_stream  io_stream,
+				   const void   *in_data, 
+				   uint64_t     in_size)
 {
     int32_t err = 0;
     
@@ -213,7 +213,7 @@ uint32_t k5_ipc_stream_write (k5_ipc_stream  io_stream,
     }
     
     if (!err) {
-        err = k5_ipc_stream_reallocate (io_stream, io_stream->size + in_size);
+        err = krb5int_ipc_stream_reallocate (io_stream, io_stream->size + in_size);
     }
     
     if (!err) {
@@ -230,15 +230,15 @@ uint32_t k5_ipc_stream_write (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-void k5_ipc_stream_free_string (char *in_string)
+void krb5int_ipc_stream_free_string (char *in_string)
 {
     free (in_string);
 }
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_read_string (k5_ipc_stream   io_stream, 
-                                    char         **out_string)
+uint32_t krb5int_ipc_stream_read_string (k5_ipc_stream   io_stream, 
+					 char         **out_string)
 {
     int32_t err = 0;
     uint32_t length = 0;
@@ -248,7 +248,7 @@ uint32_t k5_ipc_stream_read_string (k5_ipc_stream   io_stream,
     if (!out_string) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_read_uint32 (io_stream, &length);
+        err = krb5int_ipc_stream_read_uint32 (io_stream, &length);
     }
     
     if (!err) {
@@ -257,7 +257,7 @@ uint32_t k5_ipc_stream_read_string (k5_ipc_stream   io_stream,
     }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, string, length);
+        err = krb5int_ipc_stream_read (io_stream, string, length);
     }
     
     if (!err) {
@@ -272,8 +272,8 @@ uint32_t k5_ipc_stream_read_string (k5_ipc_stream   io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_write_string (k5_ipc_stream  io_stream, 
-                                     const char    *in_string)
+uint32_t krb5int_ipc_stream_write_string (k5_ipc_stream  io_stream, 
+					  const char    *in_string)
 {
     int32_t err = 0;
     uint32_t length = 0;
@@ -284,11 +284,11 @@ uint32_t k5_ipc_stream_write_string (k5_ipc_stream  io_stream,
     if (!err) {
         length = strlen (in_string) + 1;
         
-        err = k5_ipc_stream_write_uint32 (io_stream, length);
+        err = krb5int_ipc_stream_write_uint32 (io_stream, length);
     }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, in_string, length);
+        err = krb5int_ipc_stream_write (io_stream, in_string, length);
     }
     
     return k5_check_error (err);
@@ -300,8 +300,8 @@ uint32_t k5_ipc_stream_write_string (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_read_int32 (k5_ipc_stream  io_stream, 
-                                   int32_t       *out_int32)
+uint32_t krb5int_ipc_stream_read_int32 (k5_ipc_stream  io_stream, 
+					int32_t       *out_int32)
 {
     int32_t err = 0;
     int32_t int32 = 0;
@@ -310,7 +310,7 @@ uint32_t k5_ipc_stream_read_int32 (k5_ipc_stream  io_stream,
     if (!out_int32) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, &int32, sizeof (int32));
+        err = krb5int_ipc_stream_read (io_stream, &int32, sizeof (int32));
     }
     
     if (!err) {
@@ -322,8 +322,8 @@ uint32_t k5_ipc_stream_read_int32 (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_write_int32 (k5_ipc_stream io_stream, 
-                                    int32_t       in_int32)
+uint32_t krb5int_ipc_stream_write_int32 (k5_ipc_stream io_stream, 
+					 int32_t       in_int32)
 {
     int32_t err = 0;
     int32_t int32 = htonl (in_int32);
@@ -331,7 +331,7 @@ uint32_t k5_ipc_stream_write_int32 (k5_ipc_stream io_stream,
     if (!io_stream) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, &int32, sizeof (int32));
+        err = krb5int_ipc_stream_write (io_stream, &int32, sizeof (int32));
     }
     
     return k5_check_error (err);
@@ -343,8 +343,8 @@ uint32_t k5_ipc_stream_write_int32 (k5_ipc_stream io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_read_uint32 (k5_ipc_stream  io_stream, 
-                                    uint32_t      *out_uint32)
+uint32_t krb5int_ipc_stream_read_uint32 (k5_ipc_stream  io_stream, 
+					 uint32_t      *out_uint32)
 {
     int32_t err = 0;
     uint32_t uint32 = 0;
@@ -353,7 +353,7 @@ uint32_t k5_ipc_stream_read_uint32 (k5_ipc_stream  io_stream,
     if (!out_uint32) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, &uint32, sizeof (uint32));
+        err = krb5int_ipc_stream_read (io_stream, &uint32, sizeof (uint32));
     }
     
     if (!err) {
@@ -365,8 +365,8 @@ uint32_t k5_ipc_stream_read_uint32 (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_write_uint32 (k5_ipc_stream io_stream, 
-                                     uint32_t      in_uint32)
+uint32_t krb5int_ipc_stream_write_uint32 (k5_ipc_stream io_stream, 
+					  uint32_t      in_uint32)
 {
     int32_t err = 0;
     int32_t uint32 = htonl (in_uint32);
@@ -374,7 +374,7 @@ uint32_t k5_ipc_stream_write_uint32 (k5_ipc_stream io_stream,
     if (!io_stream) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, &uint32, sizeof (uint32));
+        err = krb5int_ipc_stream_write (io_stream, &uint32, sizeof (uint32));
     }
     
     return k5_check_error (err);
@@ -386,8 +386,8 @@ uint32_t k5_ipc_stream_write_uint32 (k5_ipc_stream io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_read_int64 (k5_ipc_stream  io_stream, 
-                                   int64_t       *out_int64)
+uint32_t krb5int_ipc_stream_read_int64 (k5_ipc_stream  io_stream, 
+					int64_t       *out_int64)
 {
     int32_t err = 0;
     uint64_t int64 = 0;
@@ -396,7 +396,7 @@ uint32_t k5_ipc_stream_read_int64 (k5_ipc_stream  io_stream,
     if (!out_int64) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, &int64, sizeof (int64));
+        err = krb5int_ipc_stream_read (io_stream, &int64, sizeof (int64));
     }
     
     if (!err) {
@@ -408,8 +408,8 @@ uint32_t k5_ipc_stream_read_int64 (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_write_int64 (k5_ipc_stream io_stream, 
-                                    int64_t     in_int64)
+uint32_t krb5int_ipc_stream_write_int64 (k5_ipc_stream io_stream, 
+					 int64_t     in_int64)
 {
     int32_t err = 0;
     int64_t int64 = htonll (in_int64);
@@ -417,7 +417,7 @@ uint32_t k5_ipc_stream_write_int64 (k5_ipc_stream io_stream,
     if (!io_stream) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, &int64, sizeof (int64));
+        err = krb5int_ipc_stream_write (io_stream, &int64, sizeof (int64));
     }
     
     return k5_check_error (err);
@@ -430,8 +430,8 @@ uint32_t k5_ipc_stream_write_int64 (k5_ipc_stream io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_read_uint64 (k5_ipc_stream  io_stream, 
-                                    uint64_t     *out_uint64)
+uint32_t krb5int_ipc_stream_read_uint64 (k5_ipc_stream  io_stream, 
+					 uint64_t     *out_uint64)
 {
     int32_t err = 0;
     uint64_t uint64 = 0;
@@ -440,7 +440,7 @@ uint32_t k5_ipc_stream_read_uint64 (k5_ipc_stream  io_stream,
     if (!out_uint64) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_read (io_stream, &uint64, sizeof (uint64));
+        err = krb5int_ipc_stream_read (io_stream, &uint64, sizeof (uint64));
     }
     
     if (!err) {
@@ -452,8 +452,8 @@ uint32_t k5_ipc_stream_read_uint64 (k5_ipc_stream  io_stream,
 
 /* ------------------------------------------------------------------------ */
 
-uint32_t k5_ipc_stream_write_uint64 (k5_ipc_stream io_stream, 
-                                     uint64_t      in_uint64)
+uint32_t krb5int_ipc_stream_write_uint64 (k5_ipc_stream io_stream, 
+					  uint64_t      in_uint64)
 {
     int32_t err = 0;
     int64_t uint64 = htonll (in_uint64);
@@ -461,7 +461,7 @@ uint32_t k5_ipc_stream_write_uint64 (k5_ipc_stream io_stream,
     if (!io_stream) { err = k5_check_error (EINVAL); }
     
     if (!err) {
-        err = k5_ipc_stream_write (io_stream, &uint64, sizeof (uint64));
+        err = krb5int_ipc_stream_write (io_stream, &uint64, sizeof (uint64));
     }
     
     return k5_check_error (err);