1 files changed, 7 insertions, 7 deletions

diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 3851edf7..a9931d1f 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -191,7 +191,7 @@ enum {
 typedef struct Messenger Messenger;
 
 typedef struct {
-    uint8_t client_id[crypto_box_PUBLICKEYBYTES];
+    uint8_t real_pk[crypto_box_PUBLICKEYBYTES];
     int friendcon_id;
 
     uint64_t friendrequest_lastsent; // Time at which the last friend request was sent.
@@ -313,7 +313,7 @@ struct Messenger {
     Messenger_Options options;
 };
 
-/* Format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)]
+/* Format: [real_pk (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)]
  *
  *  return FRIEND_ADDRESS_SIZE byte address to give to others.
  */
@@ -342,20 +342,20 @@ int32_t m_addfriend(Messenger *m, const uint8_t *address, const uint8_t *data, u
  *  return the friend number if success.
  *  return -1 if failure.
  */
-int32_t m_addfriend_norequest(Messenger *m, const uint8_t *client_id);
+int32_t m_addfriend_norequest(Messenger *m, const uint8_t *real_pk);
 
 /*  return the friend number associated to that client id.
  *  return -1 if no such friend.
  */
-int32_t getfriend_id(const Messenger *m, const uint8_t *client_id);
+int32_t getfriend_id(const Messenger *m, const uint8_t *real_pk);
 
-/* Copies the public key associated to that friend id into client_id buffer.
- * Make sure that client_id is of size CLIENT_ID_SIZE.
+/* Copies the public key associated to that friend id into real_pk buffer.
+ * Make sure that real_pk is of size crypto_box_PUBLICKEYBYTES.
  *
  *  return 0 if success
  *  return -1 if failure
  */
-int getclient_id(const Messenger *m, int32_t friendnumber, uint8_t *client_id);
+int get_real_pk(const Messenger *m, int32_t friendnumber, uint8_t *real_pk);
 
 /*  return friend connection id on success.
  *  return -1 if failure.