diff --git a/libretroshare/src/gxstrans/p3gxstrans.cc b/libretroshare/src/gxstrans/p3gxstrans.cc
index dab362ce2..b36a6ade6 100644
--- a/libretroshare/src/gxstrans/p3gxstrans.cc
+++ b/libretroshare/src/gxstrans/p3gxstrans.cc
@@ -248,7 +248,8 @@ void p3GxsTrans::service_tick()
 			{
 			case GxsTransItemsSubtypes::GXS_TRANS_SUBTYPE_MAIL:
 			{
-				RsGxsTransMailItem* msg = dynamic_cast<RsGxsTransMailItem*>(it->second);
+				RsGxsTransMailItem* msg =
+				        dynamic_cast<RsGxsTransMailItem*>(it->second);
 				if(!msg)
 				{
 					std::cerr << "p3GxsTrans::service_tick() (EE) "
@@ -267,7 +268,7 @@ void p3GxsTrans::service_tick()
 					          << " mailId: "<< msg->mailId
 					          << " payload.size(): " << msg->payload.size()
 					          << std::endl;
-					handleEcryptedMail(msg);
+					handleEncryptedMail(msg);
 				}
 				break;
 			}
@@ -398,7 +399,7 @@ bool p3GxsTrans::requestGroupsData(const std::list<RsGxsGroupId>* groupIds)
 	return true;
 }
 
-bool p3GxsTrans::handleEcryptedMail(const RsGxsTransMailItem* mail)
+bool p3GxsTrans::handleEncryptedMail(const RsGxsTransMailItem* mail)
 {
 	std::cout << "p3GxsTrans::handleEcryptedMail(...)" << std::endl;
 
@@ -411,7 +412,8 @@ bool p3GxsTrans::handleEcryptedMail(const RsGxsTransMailItem* mail)
 	// Hint match none of our own ids
 	if(decryptIds.empty())
 	{
-		std::cout << "p3GxsTrans::handleEcryptedMail(...) hint doesn't match" << std::endl;
+		std::cout << "p3GxsTrans::handleEcryptedMail(...) hint doesn't match"
+		          << std::endl;
 		return true;
 	}
 
diff --git a/libretroshare/src/gxstrans/p3gxstrans.h b/libretroshare/src/gxstrans/p3gxstrans.h
index d03806f72..affaaa638 100644
--- a/libretroshare/src/gxstrans/p3gxstrans.h
+++ b/libretroshare/src/gxstrans/p3gxstrans.h
@@ -242,7 +242,7 @@ private:
 
 
 	/// Decrypt email content and pass it to dispatchDecryptedMail(...)
-	bool handleEcryptedMail(const RsGxsTransMailItem* mail);
+	bool handleEncryptedMail(const RsGxsTransMailItem* mail);
 
 	/// Dispatch the message to the recipient service
 	bool dispatchDecryptedMail( const RsGxsId& authorId,
diff --git a/libretroshare/src/gxstrans/p3gxstransitems.cc b/libretroshare/src/gxstrans/p3gxstransitems.cc
index 886760215..eb5736f8e 100644
--- a/libretroshare/src/gxstrans/p3gxstransitems.cc
+++ b/libretroshare/src/gxstrans/p3gxstransitems.cc
@@ -129,7 +129,7 @@ OutgoingRecord::OutgoingRecord() :
             static_cast<uint8_t>(GxsTransItemsSubtypes::OUTGOING_RECORD_ITEM) )
 { clear();}
 
-uint32_t OutgoingRecord::size() const
+uint32_t OutgoingRecord::serial_size() const
 {
 	return 8 + // Header
 	        1 + // status
diff --git a/libretroshare/src/gxstrans/p3gxstransitems.h b/libretroshare/src/gxstrans/p3gxstransitems.h
index 3f3d38145..fa6395f3b 100644
--- a/libretroshare/src/gxstrans/p3gxstransitems.h
+++ b/libretroshare/src/gxstrans/p3gxstransitems.h
@@ -120,7 +120,7 @@ struct RsGxsTransMailItem : RsGxsTransBaseItem
 	 *
 	 * To check if one id may be the recipient of the mail or not one need to
 	 * bitwise compare the hint with the id, if at least one bit of the hint is
-	 * 0 while the corrisponding bit in the id is 1 then the id cannot be the
+	 * 0 while the corresponding bit in the id is 1 then the id cannot be the
 	 * recipient of the mail.
 	 *
 	 * Note that by design one can prove that an id is not recipient of the mail
@@ -253,7 +253,7 @@ struct OutgoingRecord : RsItem
 	GxsTransSubServices clientService;
 	RsNxsTransPresignedReceipt presignedReceipt;
 
-	uint32_t size() const;
+	uint32_t serial_size() const;
 	bool serialize(uint8_t* data, uint32_t size, uint32_t& offset) const;
 	bool deserialize(const uint8_t* data, uint32_t& size, uint32_t& offset);
 
@@ -289,7 +289,7 @@ struct RsGxsTransSerializer : RsSerialType
 		case GxsTransItemsSubtypes::OUTGOING_RECORD_ITEM:
 		{
 			OutgoingRecord* ci = dynamic_cast<OutgoingRecord*>(item);
-			if(ci) sz = ci->size();
+			if(ci) sz = ci->serial_size();
 			break;
 		}
 		default: break;