diff --git a/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc b/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc
index 179a845d7..ad95f7ee3 100644
--- a/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc
+++ b/libretroshare/src/gossipdiscovery/p3gossipdiscovery.cc
@@ -107,7 +107,7 @@ p3discovery2::p3discovery2(
 	addSerialType(new RsDiscSerialiser());
 
 	// Add self into PGP FriendList.
-    mFriendList[AuthGPG::getGPGOwnId()] = DiscPgpInfo();
+    mFriendList[AuthPGP::getGPGOwnId()] = DiscPgpInfo();
 }
 
 
@@ -219,7 +219,7 @@ void p3discovery2::removeFriend(const RsPeerId &sslId)
 		std::cerr << std::endl;
 #endif
 		/* pgp peer without any ssl entries -> check if they are still a real friend */
-        if (!(AuthGPG::isGPGAccepted(pgpId)))
+        if (!(AuthPGP::isGPGAccepted(pgpId)))
 		{
 #ifdef P3DISC_DEBUG
 			std::cerr << "p3discovery2::addFriend() pgpId is no longer a friend, removing";
@@ -604,8 +604,8 @@ void p3discovery2::updatePgpFriendList()
 	std::list<RsPgpId>::iterator lit;
 	std::map<RsPgpId, DiscPgpInfo>::iterator it;
 	
-    RsPgpId ownPgpId = AuthGPG::getGPGOwnId();
-    AuthGPG::getGPGAcceptedList(pgpList);
+    RsPgpId ownPgpId = AuthPGP::getGPGOwnId();
+    AuthPGP::getGPGAcceptedList(pgpList);
 	pgpList.push_back(ownPgpId);
 	
 	// convert to set for ordering.
@@ -723,7 +723,7 @@ void p3discovery2::processPGPList(const RsPeerId &fromId, const RsDiscPgpListIte
 		std::set<RsPgpId>::const_iterator fit;
 		for(fit = item->pgpIdSet.ids.begin(); fit != item->pgpIdSet.ids.end(); ++fit)
 		{
-            if (!AuthGPG::isPGPId(*fit))
+            if (!AuthPGP::isPGPId(*fit))
 			{
 #ifdef P3DISC_DEBUG
 				std::cerr << "p3discovery2::processPGPList() requesting certificate for PgpId: " << *fit;
@@ -1058,11 +1058,11 @@ void p3discovery2::recvPGPCertificateRequest( const RsPeerId& fromId, const RsDi
 		return;
     }
 
-    RsPgpId ownPgpId = AuthGPG::getGPGOwnId();
+    RsPgpId ownPgpId = AuthPGP::getGPGOwnId();
 	for(const RsPgpId& pgpId : item->pgpIdSet.ids)
 		if (pgpId == ownPgpId)
 			sendPGPCertificate(pgpId, fromId);
-        else if(ps.vs_disc != RS_VS_DISC_OFF && AuthGPG::isGPGAccepted(pgpId))
+        else if(ps.vs_disc != RS_VS_DISC_OFF && AuthPGP::isGPGAccepted(pgpId))
 			sendPGPCertificate(pgpId, fromId);
 		else
             std::cerr << "(WW) not sending certificate " << pgpId << " asked by friend " << fromId << " because this either this cert is not a friend, or discovery is off" << std::endl;
@@ -1078,7 +1078,7 @@ void p3discovery2::sendPGPCertificate(const RsPgpId &aboutId, const RsPeerId &to
     unsigned char *bin_data;
     size_t bin_len;
 
-    if(!AuthGPG::exportPublicKey(aboutId,bin_data,bin_len,false,true))
+    if(!AuthPGP::exportPublicKey(aboutId,bin_data,bin_len,false,true))
     {
         std::cerr << "(EE) cannot export public key " << aboutId << " requested by peer " << toId << std::endl;
 		return ;
@@ -1098,7 +1098,7 @@ void p3discovery2::recvPGPCertificate(const RsPeerId& fromId, RsDiscPgpKeyItem*
 	std::string cert_name;
 	std::list<RsPgpId> cert_signers;
 
-    if(!AuthGPG::getGPGDetailsFromBinaryBlock( (unsigned char*)item->bin_data,item->bin_len, cert_pgp_id, cert_name, cert_signers ))
+    if(!AuthPGP::getGPGDetailsFromBinaryBlock( (unsigned char*)item->bin_data,item->bin_len, cert_pgp_id, cert_name, cert_signers ))
 	{
 		std::cerr << "(EE) cannot parse own PGP key sent by " << fromId << std::endl;
 		return;
@@ -1147,7 +1147,7 @@ void p3discovery2::recvPGPCertificate(const RsPeerId& fromId, RsDiscPgpKeyItem*
     // otherwise the connection should already be accepted. This only happens when the short invite peer sends its own PGP key.
 
     if(det.skip_pgp_signature_validation)
-        AuthGPG::AllowConnection(det.gpg_id,true);
+        AuthPGP::AllowConnection(det.gpg_id,true);
 }
 
         /************* from pqiServiceMonitor *******************/
diff --git a/libretroshare/src/pgp/pgpauxutils.cc b/libretroshare/src/pgp/pgpauxutils.cc
index a9c3b36f6..99d3e8880 100644
--- a/libretroshare/src/pgp/pgpauxutils.cc
+++ b/libretroshare/src/pgp/pgpauxutils.cc
@@ -34,7 +34,7 @@ PgpAuxUtilsImpl::PgpAuxUtilsImpl()
 
 const RsPgpId& PgpAuxUtilsImpl::getPGPOwnId() 
 {
-    return AuthGPG::getGPGOwnId();
+    return AuthPGP::getGPGOwnId();
 }
 
 RsPgpId PgpAuxUtilsImpl::getPGPId(const RsPeerId& sslid)
@@ -44,7 +44,7 @@ RsPgpId PgpAuxUtilsImpl::getPGPId(const RsPeerId& sslid)
 
 bool PgpAuxUtilsImpl::getKeyFingerprint(const RsPgpId& id,PGPFingerprintType& fp) const
 {
-    return AuthGPG::getKeyFingerprint(id, fp);
+    return AuthPGP::getKeyFingerprint(id, fp);
 }
 
 bool PgpAuxUtilsImpl::VerifySignBin(const void *data, 
@@ -54,17 +54,17 @@ bool PgpAuxUtilsImpl::VerifySignBin(const void *data,
 		const PGPFingerprintType& withfingerprint)
 
 {
-    return AuthGPG::VerifySignBin(data, len, sign, signlen, withfingerprint);
+    return AuthPGP::VerifySignBin(data, len, sign, signlen, withfingerprint);
 }
 
 bool PgpAuxUtilsImpl::getGPGAllList(std::list<RsPgpId> &ids)
 {
-    return AuthGPG::getGPGAllList(ids);
+    return AuthPGP::getGPGAllList(ids);
 }
 
 bool PgpAuxUtilsImpl::parseSignature(unsigned char *sign, unsigned int signlen, RsPgpId& issuer) const 
 {
-    return AuthGPG::parseSignature(sign,signlen,issuer);
+    return AuthPGP::parseSignature(sign,signlen,issuer);
 }
 
 
diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc
index b870b5d1e..5e93823a4 100644
--- a/libretroshare/src/pqi/authgpg.cc
+++ b/libretroshare/src/pqi/authgpg.cc
@@ -46,7 +46,7 @@
 
 //const rstime_t STORE_KEY_TIMEOUT = 1 * 60 * 60; //store key is call around every hour
 
-AuthGPG *AuthGPG::_instance = NULL ;
+AuthPGP *AuthPGP::_instance = NULL ;
 
 void cleanupZombies(int numkill); // function to cleanup zombies under OSX.
 
@@ -54,24 +54,24 @@ void cleanupZombies(int numkill); // function to cleanup zombies under OSX.
 
 /* Function to sign X509_REQ via GPGme.  */
 
-int AuthGPG::availableGPGCertificatesWithPrivateKeys(std::list<RsPgpId>& pgpIds)
+int AuthPGP::availableGPGCertificatesWithPrivateKeys(std::list<RsPgpId>& pgpIds)
 {
     return instance()->mPgpHandler->availableGPGCertificatesWithPrivateKeys(pgpIds);
 }
-bool AuthGPG::getGPGDetailsFromBinaryBlock(const unsigned char *mem,size_t mem_size,RsPgpId& key_id, std::string& name, std::list<RsPgpId>& signers)
+bool AuthPGP::getGPGDetailsFromBinaryBlock(const unsigned char *mem,size_t mem_size,RsPgpId& key_id, std::string& name, std::list<RsPgpId>& signers)
 {
     return instance()->mPgpHandler->getGPGDetailsFromBinaryBlock(mem,mem_size,key_id,name,signers);
 }
-void AuthGPG::registerToConfigMgr(const std::string& fname,p3ConfigMgr *CfgMgr)
+void AuthPGP::registerToConfigMgr(const std::string& fname,p3ConfigMgr *CfgMgr)
 {
     CfgMgr->addConfiguration(fname, instance());
 }
-bool AuthGPG::decryptTextFromFile(std::string& text,const std::string& inputfile)
+bool AuthPGP::decryptTextFromFile(std::string& text,const std::string& inputfile)
 {
     return instance()->mPgpHandler->decryptTextFromFile(instance()->mOwnGpgId,text,inputfile) ;
 }
 
-bool AuthGPG::removeKeysFromPGPKeyring(const std::set<RsPgpId>& pgp_ids,std::string& backup_file,uint32_t& error_code)
+bool AuthPGP::removeKeysFromPGPKeyring(const std::set<RsPgpId>& pgp_ids,std::string& backup_file,uint32_t& error_code)
 {
 //	std::list<RsPgpId> pids ;
 //
@@ -86,7 +86,7 @@ bool AuthGPG::removeKeysFromPGPKeyring(const std::set<RsPgpId>& pgp_ids,std::str
 // 	return instance()->mPgpHandler->decryptTextFromString(mOwnGpgId,encrypted_text,output) ;
 // }
 
-bool AuthGPG::encryptTextToFile(const std::string& text,const std::string& outfile)
+bool AuthPGP::encryptTextToFile(const std::string& text,const std::string& outfile)
 {
     return instance()->mPgpHandler->encryptTextToFile(instance()->mOwnGpgId,text,outfile) ;
 }
@@ -107,7 +107,7 @@ std::string pgp_pwd_callback(void * /*hook*/, const char *uid_title, const char
 	return password ;
 }
 
-void AuthGPG::init(
+void AuthPGP::init(
         const std::string& path_to_public_keyring,
         const std::string& path_to_secret_keyring,
         const std::string& path_to_trustdb,
@@ -121,12 +121,12 @@ void AuthGPG::init(
 
 //	if(cb) instance()->mPgpHandler->setPassphraseCallback(cb);else
     instance()->mPgpHandler->setPassphraseCallback(pgp_pwd_callback);
-	_instance = new AuthGPG( path_to_public_keyring,
+	_instance = new AuthPGP( path_to_public_keyring,
 	                         path_to_secret_keyring,
 	                         path_to_trustdb, pgp_lock_file );
 }
 
-void AuthGPG::exit()
+void AuthPGP::exit()
 {
 	if(_instance)
 	{
@@ -136,7 +136,7 @@ void AuthGPG::exit()
 	}
 }
 
-AuthGPG::AuthGPG(const std::string& path_to_public_keyring,const std::string& path_to_secret_keyring,const std::string& path_to_trustdb,const std::string& pgp_lock_file)
+AuthPGP::AuthPGP(const std::string& path_to_public_keyring,const std::string& path_to_secret_keyring,const std::string& path_to_trustdb,const std::string& pgp_lock_file)
         :p3Config(),
 	gpgMtxService("AuthGPG-service"),
 	gpgMtxEngine("AuthGPG-engine"),
@@ -178,7 +178,7 @@ AuthGPG::AuthGPG(const std::string& path_to_public_keyring,const std::string& pa
  * This function must be called successfully (return == 1)
  * before anything else can be done. (except above fn).
  */
-int AuthGPG::GPGInit(const RsPgpId &ownId)
+int AuthPGP::GPGInit(const RsPgpId &ownId)
 {
 #ifdef DEBUG_AUTHGPG
 	std::cerr << "AuthGPG::GPGInit() called with own gpg id : " << ownId.toStdString() << std::endl;
@@ -197,11 +197,11 @@ int AuthGPG::GPGInit(const RsPgpId &ownId)
 	return 1;
 }
 
- AuthGPG::~AuthGPG()
+ AuthPGP::~AuthPGP()
 {
 }
 
-void AuthGPG::threadTick()
+void AuthPGP::threadTick()
 {
     rstime::rs_usleep(100 * 1000); //100 msec
 
@@ -223,7 +223,7 @@ void AuthGPG::threadTick()
     }//if (++count >= 100 || _force_sync_database)
 }
 
-void AuthGPG::processServices()
+void AuthPGP::processServices()
 {
     AuthGPGOperation *operation = NULL;
     AuthGPGService *service = NULL;
@@ -318,29 +318,29 @@ void AuthGPG::processServices()
     delete operation;
 }
 
-bool AuthGPG::DoOwnSignature(const void *data, unsigned int datalen, void *buf_sigout, unsigned int *outl, std::string reason /* = "" */)
+bool AuthPGP::DoOwnSignature(const void *data, unsigned int datalen, void *buf_sigout, unsigned int *outl, std::string reason /* = "" */)
 {
     return instance()->mPgpHandler->SignDataBin(mOwnGpgId,data,datalen,(unsigned char *)buf_sigout,outl,false,reason) ;
 }
 
 
 /* import to GnuPG and other Certificates */
-bool AuthGPG::VerifySignature(const void *data, int datalen, const void *sig, unsigned int siglen, const PGPFingerprintType& withfingerprint)
+bool AuthPGP::VerifySignature(const void *data, int datalen, const void *sig, unsigned int siglen, const PGPFingerprintType& withfingerprint)
 {
     return instance()->mPgpHandler->VerifySignBin((unsigned char*)data,datalen,(unsigned char*)sig,siglen,withfingerprint) ;
 }
 
-bool AuthGPG::parseSignature(const void *sig, unsigned int siglen, RsPgpId& issuer_id)
+bool AuthPGP::parseSignature(const void *sig, unsigned int siglen, RsPgpId& issuer_id)
 {
     return instance()->mPgpHandler->parseSignature((unsigned char*)sig,siglen,issuer_id) ;
 }
 
-bool AuthGPG::exportProfile(const std::string& fname,const RsPgpId& exported_id)
+bool AuthPGP::exportProfile(const std::string& fname,const RsPgpId& exported_id)
 {
     return instance()->mPgpHandler->exportGPGKeyPair(fname,exported_id) ;
 }
 
-bool AuthGPG::exportIdentityToString(
+bool AuthPGP::exportIdentityToString(
         std::string& data, const RsPgpId& pgpId, bool includeSignatures,
         std::string& errorMsg )
 {
@@ -348,24 +348,24 @@ bool AuthGPG::exportIdentityToString(
 	            data, pgpId, includeSignatures, errorMsg);
 }
 
-bool AuthGPG::importProfile(const std::string& fname,RsPgpId& imported_id,std::string& import_error)
+bool AuthPGP::importProfile(const std::string& fname,RsPgpId& imported_id,std::string& import_error)
 {
     return instance()->mPgpHandler->importGPGKeyPair(fname,imported_id,import_error) ;
 }
 
-bool AuthGPG::importProfileFromString(const std::string &data, RsPgpId &gpg_id, std::string &import_error)
+bool AuthPGP::importProfileFromString(const std::string &data, RsPgpId &gpg_id, std::string &import_error)
 {
     return instance()->mPgpHandler->importGPGKeyPairFromString(data, gpg_id, import_error);
 }
 
-bool   AuthGPG::active()
+bool   AuthPGP::active()
 {
         RsStackMutex stack(instance()->gpgMtxData); /******* LOCKED ******/
 
         return instance()->gpgKeySelected;
 }
 
-bool    AuthGPG::GeneratePGPCertificate(const std::string& name, const std::string& email, const std::string& passwd, RsPgpId& pgpId, const int keynumbits, std::string& errString)
+bool    AuthPGP::GeneratePGPCertificate(const std::string& name, const std::string& email, const std::string& passwd, RsPgpId& pgpId, const int keynumbits, std::string& errString)
 {
     RsStackMutex stack(instance()->gpgMtxEngine); /******* LOCKED ******/
 
@@ -373,7 +373,7 @@ bool    AuthGPG::GeneratePGPCertificate(const std::string& name, const std::stri
 }
 
 /**** These Two are common */
-std::string AuthGPG::getGPGName(const RsPgpId& id,bool *success)
+std::string AuthPGP::getGPGName(const RsPgpId& id,bool *success)
 {
     RsStackMutex stack(instance()->gpgMtxData); /******* LOCKED ******/
 
@@ -391,7 +391,7 @@ std::string AuthGPG::getGPGName(const RsPgpId& id,bool *success)
 	}
 }
 
-AuthGPG *AuthGPG::instance()
+AuthPGP *AuthPGP::instance()
 {
     if(!_instance)
     {
@@ -401,16 +401,16 @@ AuthGPG *AuthGPG::instance()
 
     return _instance;
 }
-bool AuthGPG::isPGPId(const RsPgpId& id)
+bool AuthPGP::isPGPId(const RsPgpId& id)
 {
     return instance()->mPgpHandler->isGPGId(id);
 }
-bool AuthGPG::isPGPAccepted(const RsPgpId& id)
+bool AuthPGP::isPGPAccepted(const RsPgpId& id)
 {
     return instance()->mPgpHandler->isGPGAccepted(id);
 }
 /**** These Two are common */
-std::string AuthGPG::getGPGEmail(const RsPgpId& id,bool *success)
+std::string AuthPGP::getGPGEmail(const RsPgpId& id,bool *success)
 {
     RsStackMutex stack(instance()->gpgMtxData); /******* LOCKED ******/
     const PGPCertificateInfo *info = instance()->mPgpHandler->getCertificateInfo(id) ;
@@ -429,18 +429,18 @@ std::string AuthGPG::getGPGEmail(const RsPgpId& id,bool *success)
 
 /**** GPG versions ***/
 
-const RsPgpId& AuthGPG::getGPGOwnId()
+const RsPgpId& AuthPGP::getGPGOwnId()
 {
     RsStackMutex stack(instance()->gpgMtxData); /******* LOCKED ******/
     return instance()->mOwnGpgId ;
 }
 
-std::string AuthGPG::getGPGOwnName()
+std::string AuthPGP::getGPGOwnName()
 {
     return getGPGName(instance()->mOwnGpgId) ;
 }
 
-bool	AuthGPG::getGPGAllList(std::list<RsPgpId> &ids)
+bool	AuthPGP::getGPGAllList(std::list<RsPgpId> &ids)
 {
     RsStackMutex stack(instance()->gpgMtxData); /******* LOCKED ******/
 
@@ -448,7 +448,7 @@ bool	AuthGPG::getGPGAllList(std::list<RsPgpId> &ids)
 
 	return true;
 }
-const PGPCertificateInfo *AuthGPG::getCertInfoFromStdString(const std::string& pgp_id) const
+const PGPCertificateInfo *AuthPGP::getCertInfoFromStdString(const std::string& pgp_id) const
 {
 	try
 	{
@@ -460,11 +460,11 @@ const PGPCertificateInfo *AuthGPG::getCertInfoFromStdString(const std::string& p
 		return NULL ;
 	}
 }
-bool AuthGPG::haveSecretKey(const RsPgpId& id)
+bool AuthPGP::haveSecretKey(const RsPgpId& id)
 {
     return instance()->mPgpHandler->haveSecretKey(id) ;
 }
-bool AuthGPG::isKeySupported(const RsPgpId& id)
+bool AuthPGP::isKeySupported(const RsPgpId& id)
 {
     const PGPCertificateInfo *pc = instance()->mPgpHandler->getCertificateInfo(id) ;
 
@@ -474,7 +474,7 @@ bool AuthGPG::isKeySupported(const RsPgpId& id)
 	return !(pc->_flags & PGPCertificateInfo::PGP_CERTIFICATE_FLAG_UNSUPPORTED_ALGORITHM) ;
 }
 
-bool AuthGPG::getGPGDetails(const RsPgpId& pgp_id, RsPeerDetails &d)
+bool AuthPGP::getGPGDetails(const RsPgpId& pgp_id, RsPeerDetails &d)
 {
     RsStackMutex stack(instance()->gpgMtxData); /******* LOCKED ******/
 
@@ -505,7 +505,7 @@ bool AuthGPG::getGPGDetails(const RsPgpId& pgp_id, RsPeerDetails &d)
 	return true;
 }
 
-bool AuthGPG::getGPGFilteredList(std::list<RsPgpId>& list,bool (*filter)(const PGPCertificateInfo&))
+bool AuthPGP::getGPGFilteredList(std::list<RsPgpId>& list,bool (*filter)(const PGPCertificateInfo&))
 {
     return instance()->mPgpHandler->getGPGFilteredList(list,filter) ;
 }
@@ -514,17 +514,17 @@ static bool filter_Validity(const PGPCertificateInfo& /*info*/) { return true ;
 static bool filter_Accepted(const PGPCertificateInfo& info) { return info._flags & PGPCertificateInfo::PGP_CERTIFICATE_FLAG_ACCEPT_CONNEXION ; }
 static bool filter_OwnSigned(const PGPCertificateInfo& info) { return info._flags & PGPCertificateInfo::PGP_CERTIFICATE_FLAG_HAS_OWN_SIGNATURE ; }
 
-bool	AuthGPG::getGPGValidList(std::list<RsPgpId> &ids)
+bool	AuthPGP::getGPGValidList(std::list<RsPgpId> &ids)
 {
 	return getGPGFilteredList(ids,&filter_Validity);
 }
 
-bool	AuthGPG::getGPGAcceptedList(std::list<RsPgpId> &ids)
+bool	AuthPGP::getGPGAcceptedList(std::list<RsPgpId> &ids)
 {
 	return getGPGFilteredList(ids,&filter_Accepted);
 }
 
-bool	AuthGPG::getGPGSignedList(std::list<RsPgpId> &ids)
+bool	AuthPGP::getGPGSignedList(std::list<RsPgpId> &ids)
 {
 	return getGPGFilteredList(ids,&filter_OwnSigned);
 }
@@ -557,14 +557,14 @@ bool	AuthGPG::getGPGSignedList(std::list<RsPgpId> &ids)
 
 
 /* SKTAN : do not know how to use std::string id */
- std::string AuthGPG::SaveCertificateToString(const RsPgpId &id,bool include_signatures)
+ std::string AuthPGP::SaveCertificateToString(const RsPgpId &id,bool include_signatures)
  {
     RsStackMutex stack(instance()->gpgMtxEngine); /******* LOCKED ******/
 
     return instance()->mPgpHandler->SaveCertificateToString(id,include_signatures) ;
  }
 /* import to GnuPG and other Certificates */
-bool AuthGPG::LoadPGPKeyFromBinaryData(const unsigned char *data,uint32_t data_len, RsPgpId& gpg_id,std::string& error_string)
+bool AuthPGP::LoadPGPKeyFromBinaryData(const unsigned char *data,uint32_t data_len, RsPgpId& gpg_id,std::string& error_string)
 {
     RsStackMutex stack(instance()->gpgMtxEngine); /******* LOCKED ******/
 
@@ -578,7 +578,7 @@ bool AuthGPG::LoadPGPKeyFromBinaryData(const unsigned char *data,uint32_t data_l
 }
 
 /* import to GnuPG and other Certificates */
-bool AuthGPG::LoadCertificateFromString(const std::string &str, RsPgpId& gpg_id,std::string& error_string)
+bool AuthPGP::LoadCertificateFromString(const std::string &str, RsPgpId& gpg_id,std::string& error_string)
 {
     RsStackMutex stack(instance()->gpgMtxEngine); /******* LOCKED ******/
 
@@ -605,7 +605,7 @@ bool AuthGPG::LoadCertificateFromString(const std::string &str, RsPgpId& gpg_id,
 /*************************************/
 
 /* These take PGP Ids */
-bool AuthGPG::AllowConnection(const RsPgpId& gpg_id, bool accept)
+bool AuthPGP::AllowConnection(const RsPgpId& gpg_id, bool accept)
 {
 #ifdef GPG_DEBUG
         std::cerr << "AuthGPG::AllowConnection(" << gpg_id << ")" << std::endl;
@@ -625,7 +625,7 @@ bool AuthGPG::AllowConnection(const RsPgpId& gpg_id, bool accept)
 }
 
 /* These take PGP Ids */
-bool AuthGPG::SignCertificateLevel0(const RsPgpId &id)
+bool AuthPGP::SignCertificateLevel0(const RsPgpId &id)
 {
 #ifdef GPG_DEBUG
 	std::cerr << "AuthGPG::SignCertificat(" << id << ")" << std::endl;
@@ -634,7 +634,7 @@ bool AuthGPG::SignCertificateLevel0(const RsPgpId &id)
     return instance()->privateSignCertificate(id) ;
 }
 
-bool AuthGPG::RevokeCertificate(const RsPgpId &id)
+bool AuthPGP::RevokeCertificate(const RsPgpId &id)
 {
 	/* remove unused parameter warnings */
 	(void) id;
@@ -646,7 +646,7 @@ bool AuthGPG::RevokeCertificate(const RsPgpId &id)
 	return false;
 }
 
-bool AuthGPG::TrustCertificate(const RsPgpId& id, int trustlvl)
+bool AuthPGP::TrustCertificate(const RsPgpId& id, int trustlvl)
 {
 #ifdef GPG_DEBUG
 	std::cerr << "AuthGPG::TrustCertificate(" << id << ", " << trustlvl << ")" << std::endl;
@@ -654,41 +654,41 @@ bool AuthGPG::TrustCertificate(const RsPgpId& id, int trustlvl)
     return instance()->privateTrustCertificate(id, trustlvl) ;
 }
 
-bool AuthGPG::encryptDataBin(const RsPgpId& pgp_id,const void *data, unsigned int datalen, unsigned char *sign, unsigned int *signlen)
+bool AuthPGP::encryptDataBin(const RsPgpId& pgp_id,const void *data, unsigned int datalen, unsigned char *sign, unsigned int *signlen)
 {
     return instance()->mPgpHandler->encryptDataBin(RsPgpId(pgp_id),data,datalen,sign,signlen) ;
 }
 
-bool AuthGPG::decryptDataBin(const void *data, unsigned int datalen, unsigned char *sign, unsigned int *signlen)
+bool AuthPGP::decryptDataBin(const void *data, unsigned int datalen, unsigned char *sign, unsigned int *signlen)
 {
     return instance()->mPgpHandler->decryptDataBin(instance()->mOwnGpgId,data,datalen,sign,signlen) ;
 }
-bool AuthGPG::SignDataBin(const void *data, unsigned int datalen, unsigned char *sign, unsigned int *signlen, std::string reason /*= ""*/)
+bool AuthPGP::SignDataBin(const void *data, unsigned int datalen, unsigned char *sign, unsigned int *signlen, std::string reason /*= ""*/)
 {
     return instance()->DoOwnSignature(data, datalen, sign, signlen, reason);
 }
 
-bool AuthGPG::exportPublicKey( const RsPgpId& id, unsigned char*& mem_block, size_t& mem_size, bool armoured, bool include_signatures )
+bool AuthPGP::exportPublicKey( const RsPgpId& id, unsigned char*& mem_block, size_t& mem_size, bool armoured, bool include_signatures )
 {
     return instance()->mPgpHandler->exportPublicKey(id,mem_block,mem_size,armoured,include_signatures);
 }
 
-bool AuthGPG::isPgpPubKeyAvailable(const RsPgpId& pgp_id)
+bool AuthPGP::isPgpPubKeyAvailable(const RsPgpId& pgp_id)
 {
     return instance()->mPgpHandler->isPgpPubKeyAvailable(pgp_id);
 }
-bool AuthGPG::getKeyFingerprint(const RsPgpId& id,PGPFingerprintType& fp)
+bool AuthPGP::getKeyFingerprint(const RsPgpId& id,PGPFingerprintType& fp)
 {
     return instance()->mPgpHandler->getKeyFingerprint(id,fp);
 }
-bool AuthGPG::VerifySignBin(const void *data, uint32_t datalen, unsigned char *sign, unsigned int signlen, const PGPFingerprintType& withfingerprint)
+bool AuthPGP::VerifySignBin(const void *data, uint32_t datalen, unsigned char *sign, unsigned int signlen, const PGPFingerprintType& withfingerprint)
 {
     return instance()->VerifySignature(data, datalen, sign, signlen, withfingerprint);
 }
 
 /* Sign/Trust stuff */
 
-int	AuthGPG::privateSignCertificate(const RsPgpId &id)
+int	AuthPGP::privateSignCertificate(const RsPgpId &id)
 {
 	RsStackMutex stack(gpgMtxData); /******* LOCKED ******/
 
@@ -698,7 +698,7 @@ int	AuthGPG::privateSignCertificate(const RsPgpId &id)
 }
 
 /* revoke the signature on Certificate */
-int	AuthGPG::privateRevokeCertificate(const RsPgpId &/*id*/)
+int	AuthPGP::privateRevokeCertificate(const RsPgpId &/*id*/)
 {
 	//RsStackMutex stack(gpgMtx); /******* LOCKED ******/
 	std::cerr << __PRETTY_FUNCTION__ << ": not implemented!" << std::endl;
@@ -706,7 +706,7 @@ int	AuthGPG::privateRevokeCertificate(const RsPgpId &/*id*/)
 	return 0;
 }
 
-int	AuthGPG::privateTrustCertificate(const RsPgpId& id, int trustlvl)
+int	AuthPGP::privateTrustCertificate(const RsPgpId& id, int trustlvl)
 {
 	RsStackMutex stack(gpgMtxData); /******* LOCKED ******/
 
@@ -726,18 +726,18 @@ int	AuthGPG::privateTrustCertificate(const RsPgpId& id, int trustlvl)
 // --------------------------------  Config functions  ------------------------------ //
 // -----------------------------------------------------------------------------------//
 //
-RsSerialiser *AuthGPG::setupSerialiser()
+RsSerialiser *AuthPGP::setupSerialiser()
 {
         RsSerialiser *rss = new RsSerialiser ;
         rss->addSerialType(new RsGeneralConfigSerialiser());
         return rss ;
 }
-bool AuthGPG::isGPGAccepted(const RsPgpId& id)
+bool AuthPGP::isGPGAccepted(const RsPgpId& id)
 {
     return instance()->mPgpHandler->isGPGAccepted(id);
 }
 
-bool AuthGPG::saveList(bool& cleanup, std::list<RsItem*>& lst)
+bool AuthPGP::saveList(bool& cleanup, std::list<RsItem*>& lst)
 {
 #ifdef GPG_DEBUG
 	std::cerr << "AuthGPG::saveList() called" << std::endl ;
@@ -768,7 +768,7 @@ bool AuthGPG::saveList(bool& cleanup, std::list<RsItem*>& lst)
 	return true;
 }
 
-bool AuthGPG::loadList(std::list<RsItem*>& load)
+bool AuthPGP::loadList(std::list<RsItem*>& load)
 {
 #ifdef GPG_DEBUG
 	std::cerr << "AuthGPG::loadList() Item Count: " << load.size() << std::endl;
@@ -799,7 +799,7 @@ bool AuthGPG::loadList(std::list<RsItem*>& load)
 	return true;
 }
 
-bool AuthGPG::addService(AuthGPGService *service)
+bool AuthPGP::addService(AuthGPGService *service)
 {
     RsStackMutex stack(instance()->gpgMtxService); /********* LOCKED *********/
 
diff --git a/libretroshare/src/pqi/authgpg.h b/libretroshare/src/pqi/authgpg.h
index 177f71663..d124efdd4 100644
--- a/libretroshare/src/pqi/authgpg.h
+++ b/libretroshare/src/pqi/authgpg.h
@@ -89,7 +89,7 @@ public:
     virtual void setGPGOperation(AuthGPGOperation *operation) = 0;
 };
 
-class AuthGPG: public p3Config, public RsTickingThread
+class AuthPGP: public p3Config, public RsTickingThread
 {
 public:
     static void init(const std::string& path_to_pubring,
@@ -237,11 +237,11 @@ public:
         static bool addService(AuthGPGService *service) ;
 
 		// This is for debug purpose only. Don't use it !!
-		static void setAuthGPG_debug(AuthGPG *auth_gpg) { _instance = auth_gpg ; } 
+        static void setAuthGPG_debug(AuthPGP *auth_gpg) { _instance = auth_gpg ; }
 
 	protected:
-		AuthGPG(const std::string& path_to_pubring, const std::string& path_to_secring,const std::string& path_to_trustdb,const std::string& pgp_lock_file);
-		virtual ~AuthGPG();
+        AuthPGP(const std::string& path_to_pubring, const std::string& path_to_secring,const std::string& path_to_trustdb,const std::string& pgp_lock_file);
+        virtual ~AuthPGP();
 
 		/*****************************************************************/
 		/***********************  p3config  ******************************/
@@ -286,7 +286,7 @@ private:
 	void threadTick() override; /// @see RsTickingThread
 
 private:
-        static AuthGPG *instance();
+        static AuthPGP *instance();
 
 		RsMutex gpgMtxService;
 		RsMutex gpgMtxEngine;
@@ -310,7 +310,7 @@ private:
 
 		std::list<AuthGPGService*> services ;
 
-		static AuthGPG *_instance ;
+        static AuthPGP *_instance ;
 };
 
 #endif
diff --git a/libretroshare/src/pqi/authssl.cc b/libretroshare/src/pqi/authssl.cc
index 6d14d0043..47eea9e58 100644
--- a/libretroshare/src/pqi/authssl.cc
+++ b/libretroshare/src/pqi/authssl.cc
@@ -759,7 +759,7 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/)
         //long version = 0x00;
         unsigned long chtype = MBSTRING_UTF8;
         X509_NAME *issuer_name = X509_NAME_new();
-        X509_NAME_add_entry_by_txt(issuer_name, "CN", chtype, (unsigned char *) AuthGPG::getGPGOwnId().toStdString().c_str(), -1, -1, 0);
+        X509_NAME_add_entry_by_txt(issuer_name, "CN", chtype, (unsigned char *) AuthPGP::getGPGOwnId().toStdString().c_str(), -1, -1, 0);
 /****
         X509_NAME_add_entry_by_NID(issuer_name, 48, 0,
                         (unsigned char *) "email@email.com", -1, -1, 0);
@@ -769,7 +769,7 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/)
                         (unsigned char *) "loc", -1, -1, 0);
 ****/
 
-        std::cerr << "AuthSSLimpl::SignX509Req() Issuer name: " << AuthGPG::getGPGOwnId().toStdString() << std::endl;
+        std::cerr << "AuthSSLimpl::SignX509Req() Issuer name: " << AuthPGP::getGPGOwnId().toStdString() << std::endl;
 
 #ifdef V07_NON_BACKWARD_COMPATIBLE_CHANGE_002
 		static const uint64_t CERTIFICATE_SERIAL_NUMBER = RS_CERTIFICATE_VERSION_NUMBER_07_0001 ;
@@ -944,7 +944,7 @@ X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/)
         std::cerr << "Buffers Allocated" << std::endl;
 
         /* NOW Sign via GPG Functions */
-        if (!AuthGPG::SignDataBin(buf_in, inl, buf_sigout, (unsigned int *) &sigoutl,"AuthSSLimpl::SignX509ReqWithGPG()"))
+        if (!AuthPGP::SignDataBin(buf_in, inl, buf_sigout, (unsigned int *) &sigoutl,"AuthSSLimpl::SignX509ReqWithGPG()"))
         {
                 sigoutl = 0;
                 goto err;
@@ -1039,7 +1039,7 @@ bool AuthSSLimpl::AuthX509WithGPG(X509 *x509,bool verbose, uint32_t& diagnostic)
 {
 	RsPgpId issuer = RsX509Cert::getCertIssuer(*x509);
 	RsPeerDetails pd;
-    if (!AuthGPG::getGPGDetails(issuer, pd))
+    if (!AuthPGP::getGPGDetails(issuer, pd))
 	{
 		RsInfo() << __PRETTY_FUNCTION__ << " X509 NOT authenticated : "
 		         << "AuthGPG::getAuthGPG()->getGPGDetails(" << issuer
@@ -1184,7 +1184,7 @@ bool AuthSSLimpl::AuthX509WithGPG(X509 *x509,bool verbose, uint32_t& diagnostic)
 
 		// passed, verify the signature itself
 
-        if (!AuthGPG::VerifySignBin( signed_data, signed_data_length, signature->data, static_cast<unsigned int>(signature->length), pd.fpr ))
+        if (!AuthPGP::VerifySignBin( signed_data, signed_data_length, signature->data, static_cast<unsigned int>(signature->length), pd.fpr ))
 		{
 			diagnostic = RS_SSL_HANDSHAKE_DIAGNOSTIC_WRONG_SIGNATURE;
 			goto err;
@@ -1380,7 +1380,7 @@ int AuthSSLimpl::VerifyX509Callback(int /*preverify_ok*/, X509_STORE_CTX* ctx)
     std::cerr << "******* VerifyX509Callback cert: " << std::hex << ctx->cert <<std::dec << std::endl;
 #endif
 
-    if ( !isSslOnlyFriend && pgpId != AuthGPG::getGPGOwnId() && !AuthGPG::isGPGAccepted(pgpId) )
+    if ( !isSslOnlyFriend && pgpId != AuthPGP::getGPGOwnId() && !AuthPGP::isGPGAccepted(pgpId) )
 	{
 		std::string errMsg = "Connection attempt signed by PGP key id: " +
 		        pgpId.toStdString() + " not accepted because it is not"
diff --git a/libretroshare/src/pqi/p3peermgr.cc b/libretroshare/src/pqi/p3peermgr.cc
index 15eaa08f8..c42a0aa24 100644
--- a/libretroshare/src/pqi/p3peermgr.cc
+++ b/libretroshare/src/pqi/p3peermgr.cc
@@ -812,11 +812,11 @@ int p3PeerMgrIMPL::getFriendCount(bool ssl, bool online)
 
 	// count all gpg id's
 	std::list<RsPgpId> gpgIds;
-    AuthGPG::getGPGAcceptedList(gpgIds);
+    AuthPGP::getGPGAcceptedList(gpgIds);
 
 	// add own gpg id, if we have more than one location
 	std::list<RsPeerId> ownSslIds;
-    getAssociatedPeers(AuthGPG::getGPGOwnId(), ownSslIds);
+    getAssociatedPeers(AuthPGP::getGPGOwnId(), ownSslIds);
 
 	return gpgIds.size() + ((ownSslIds.size() > 0) ? 1 : 0);
 }
@@ -962,7 +962,7 @@ bool p3PeerMgrIMPL::addFriend(const RsPeerId& input_id, const RsPgpId& input_gpg
 
         // check that the PGP key is known
 
-        if(!AuthGPG::isPGPId(gpg_id))
+        if(!AuthPGP::isPGPId(gpg_id))
         {
 			RsErr() << "Trying to add SSL id (" << id << ") to be validated with unknown PGP key (" << gpg_id << ". This is a bug!" << std::endl;
 			return false;
@@ -970,7 +970,7 @@ bool p3PeerMgrIMPL::addFriend(const RsPeerId& input_id, const RsPgpId& input_gpg
 
 		//Authentication is now tested at connection time, we don't store the ssl cert anymore
 		//
-        if (!AuthGPG::isGPGAccepted(gpg_id) &&  gpg_id != AuthGPG::getGPGOwnId())
+        if (!AuthPGP::isGPGAccepted(gpg_id) &&  gpg_id != AuthPGP::getGPGOwnId())
 		{
 #ifdef PEER_DEBUG
 			std::cerr << "p3PeerMgrIMPL::addFriend() gpg is not accepted" << std::endl;
@@ -1024,7 +1024,7 @@ bool p3PeerMgrIMPL::addFriend(const RsPeerId& input_id, const RsPgpId& input_gpg
 
 		pstate.id = id;
 		pstate.gpg_id = gpg_id;
-        pstate.name = AuthGPG::getGPGName(gpg_id);
+        pstate.name = AuthPGP::getGPGName(gpg_id);
 
 		pstate.vs_disc = vs_disc;
 		pstate.vs_dht = vs_dht;
@@ -1126,8 +1126,8 @@ bool p3PeerMgrIMPL::addSslOnlyFriend( const RsPeerId& sslId, const RsPgpId& pgp_
 	 * superficially set to true the PGP signature verification would have been
 	 * skipped and the attacker connection would be accepted.
 	 * If the PGP key is available add it as full friend. */
-    if(AuthGPG::isPgpPubKeyAvailable(pgp_id))
-        AuthGPG::AllowConnection(pgp_id, true);
+    if(AuthPGP::isPgpPubKeyAvailable(pgp_id))
+        AuthPGP::AllowConnection(pgp_id, true);
 	else
 		pstate.skip_pgp_signature_validation = true;
 
@@ -2470,7 +2470,7 @@ bool  p3PeerMgrIMPL::loadList(std::list<RsItem *>& load)
 			    setOwnNetworkMode(pitem->netMode);
 			    setOwnVisState(pitem->vs_disc, pitem->vs_dht);
 
-                mOwnState.gpg_id = AuthGPG::getGPGOwnId();
+                mOwnState.gpg_id = AuthPGP::getGPGOwnId();
 			    mOwnState.location = AuthSSL::getAuthSSL()->getOwnLocation();
 		    }
 		    else
@@ -2642,7 +2642,7 @@ bool  p3PeerMgrIMPL::loadList(std::list<RsItem *>& load)
 #endif
 
 		    for(uint32_t i=0;i<sitem->pgp_ids.size();++i)
-                if(AuthGPG::isGPGAccepted(sitem->pgp_ids[i]) || sitem->pgp_ids[i] == AuthGPG::getGPGOwnId())
+                if(AuthPGP::isGPGAccepted(sitem->pgp_ids[i]) || sitem->pgp_ids[i] == AuthPGP::getGPGOwnId())
 			    {
 				    mFriendsPermissionFlags[sitem->pgp_ids[i]] = sitem->service_flags[i] ;
 #ifdef PEER_DEBUG
@@ -2684,7 +2684,7 @@ bool  p3PeerMgrIMPL::loadList(std::list<RsItem *>& load)
         for(auto group_pair:groupList)
         {
             for(auto profileIdIt(group_pair.second.peerIds.begin());profileIdIt!=group_pair.second.peerIds.end();)
-                if(AuthGPG::isGPGAccepted(*profileIdIt) || *profileIdIt == AuthGPG::getGPGOwnId())
+                if(AuthPGP::isGPGAccepted(*profileIdIt) || *profileIdIt == AuthPGP::getGPGOwnId())
                     ++profileIdIt;
                 else
                 {
diff --git a/libretroshare/src/pqi/pqissl.cc b/libretroshare/src/pqi/pqissl.cc
index b6f655692..bf91b72d9 100644
--- a/libretroshare/src/pqi/pqissl.cc
+++ b/libretroshare/src/pqi/pqissl.cc
@@ -1213,7 +1213,7 @@ int pqissl::Authorise_SSL_Connection()
 	}
 
 	RsPgpId pgpId = RsX509Cert::getCertIssuer(*peercert);
-    if( !isSslOnlyFriend && pgpId != AuthGPG::getGPGOwnId() && !AuthGPG::isGPGAccepted(pgpId) )
+    if( !isSslOnlyFriend && pgpId != AuthPGP::getGPGOwnId() && !AuthPGP::isGPGAccepted(pgpId) )
 	{
 		RsFatal() << __PRETTY_FUNCTION__ << " pgpId: " << pgpId
 		          << " is not friend. It is very unlikely to happen at this "
diff --git a/libretroshare/src/pqi/pqissllistener.cc b/libretroshare/src/pqi/pqissllistener.cc
index a9e392a56..c579280bc 100644
--- a/libretroshare/src/pqi/pqissllistener.cc
+++ b/libretroshare/src/pqi/pqissllistener.cc
@@ -797,7 +797,7 @@ int pqissllistener::completeConnection(int fd, IncomingSSLInfo& info)
 		exit(failure);
 	}
 
-    if( !isSslOnlyFriend && pgpId != AuthGPG::getGPGOwnId() && !AuthGPG::isGPGAccepted(pgpId) )
+    if( !isSslOnlyFriend && pgpId != AuthPGP::getGPGOwnId() && !AuthPGP::isGPGAccepted(pgpId) )
 	{
 		RsFatal() << __PRETTY_FUNCTION__ << " pgpId: " << pgpId
 		          << " is not friend. It is very unlikely to happen at this "
diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc
index 3251f33eb..62c60815b 100644
--- a/libretroshare/src/rsserver/p3face-config.cc
+++ b/libretroshare/src/rsserver/p3face-config.cc
@@ -118,7 +118,7 @@ void RsServer::rsGlobalShutDown()
 //         if(mWire) mWire->join();
 // #endif
 
-	AuthGPG::exit();
+	AuthPGP::exit();
 
 	mShutdownCallback(0);
 }
diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc
index 25caac374..58dae7e44 100644
--- a/libretroshare/src/rsserver/p3peers.cc
+++ b/libretroshare/src/rsserver/p3peers.cc
@@ -254,7 +254,7 @@ bool p3Peers::setPeerMaximumRates(const RsPgpId& pid,uint32_t maxUploadRate,uint
 
 bool p3Peers::haveSecretKey(const RsPgpId& id)
 {
-    return AuthGPG::haveSecretKey(id);
+    return AuthPGP::haveSecretKey(id);
 }
 
 /* There are too many dependancies of this function
@@ -273,7 +273,7 @@ bool p3Peers::getPeerDetails(const RsPeerId& id, RsPeerDetails &d)
 	if (id == sOwnId)
 	{
 		mPeerMgr->getOwnNetStatus(ps);
-        ps.gpg_id = AuthGPG::getGPGOwnId();
+        ps.gpg_id = AuthPGP::getGPGOwnId();
 	}
 	else if (!mPeerMgr->getFriendNetStatus(id, ps))
 	{
@@ -559,17 +559,17 @@ bool p3Peers::isProxyAddress(const uint32_t type, const sockaddr_storage& addr)
 
 bool p3Peers::isKeySupported(const RsPgpId& id)
 {
-    return AuthGPG::isKeySupported(id);
+    return AuthPGP::isKeySupported(id);
 }
 
 std::string p3Peers::getGPGName(const RsPgpId &gpg_id)
 {
 	/* get from mAuthMgr as it should have more peers? */
-        return AuthGPG::getGPGName(gpg_id);
+        return AuthPGP::getGPGName(gpg_id);
 }
 
 bool p3Peers::isPgpFriend(const RsPgpId& pgpId)
-{ return AuthGPG::isGPGAccepted(pgpId); }
+{ return AuthPGP::isGPGAccepted(pgpId); }
 
 bool p3Peers::isSslOnlyFriend(const RsPeerId& sslId)
 {
@@ -597,7 +597,7 @@ std::string p3Peers::getPeerName(const RsPeerId& ssl)
 #endif
 	std::string name;
 	if (ssl == AuthSSL::getAuthSSL()->OwnId()) 
-        return AuthGPG::getGPGOwnName();
+        return AuthPGP::getGPGOwnName();
 	
 	if (mPeerMgr->getPeerName(ssl, name)) 
 	{
@@ -617,7 +617,7 @@ bool	p3Peers::getGPGAllList(std::list<RsPgpId> &ids)
 #endif
 
         /* get from mAuthMgr */
-        AuthGPG::getGPGAllList(ids);
+        AuthPGP::getGPGAllList(ids);
         return true;
 }
 
@@ -628,7 +628,7 @@ bool	p3Peers::getGPGValidList(std::list<RsPgpId> &ids)
 #endif
 
         /* get from mAuthMgr */
-        AuthGPG::getGPGValidList(ids);
+        AuthPGP::getGPGValidList(ids);
         return true;
 }
 
@@ -639,14 +639,14 @@ bool	p3Peers::getGPGSignedList(std::list<RsPgpId> &ids)
 #endif
 
         /* get from mAuthMgr */
-        AuthGPG::getGPGSignedList(ids);
+        AuthPGP::getGPGSignedList(ids);
         return true;
 }
 
 bool p3Peers::getPgpFriendList(std::vector<RsPgpId>& pgpIds)
 {
 	std::list<RsPgpId> ids;
-    if(AuthGPG::getGPGAcceptedList(ids))
+    if(AuthPGP::getGPGAcceptedList(ids))
 	{
 		pgpIds.clear();
 		std::copy(ids.begin(), ids.end(), std::back_inserter(pgpIds));
@@ -660,7 +660,7 @@ bool	p3Peers::getGPGAcceptedList(std::list<RsPgpId> &ids)
 #ifdef P3PEERS_DEBUG
         std::cerr << "p3Peers::getGPGAcceptedList()" << std::endl;
 #endif
-        AuthGPG::getGPGAcceptedList(ids);
+        AuthPGP::getGPGAcceptedList(ids);
         return true;
 }
 
@@ -676,7 +676,7 @@ bool	p3Peers::getAssociatedSSLIds(const RsPgpId &gpg_id, std::list<RsPeerId> &id
 
 bool    p3Peers::gpgSignData(const void *data, const uint32_t len, unsigned char *sign, unsigned int *signlen, std::string reason /* = "" */)
 {
-    return AuthGPG::SignDataBin(data,len,sign,signlen, reason);
+    return AuthPGP::SignDataBin(data,len,sign,signlen, reason);
 }
 
 RsPgpId p3Peers::pgpIdFromFingerprint(const RsPgpFingerprint& fpr)
@@ -691,7 +691,7 @@ bool	p3Peers::getGPGDetails(const RsPgpId &pgp_id, RsPeerDetails &d)
 #endif
 
 	/* get from mAuthMgr */
-    bool res = AuthGPG::getGPGDetails(pgp_id, d);
+    bool res = AuthPGP::getGPGDetails(pgp_id, d);
 
 	d.isOnlyGPGdetail = true ;
 	d.service_perm_flags = mPeerMgr->servicePermissionFlags(pgp_id) ;
@@ -706,7 +706,7 @@ const RsPgpId& p3Peers::getGPGOwnId()
 #endif
 
 	/* get from mAuthMgr */
-        return AuthGPG::getGPGOwnId();
+        return AuthPGP::getGPGOwnId();
 }
 
 RsPgpId p3Peers::getGPGId(const RsPeerId& sslid)
@@ -718,7 +718,7 @@ RsPgpId p3Peers::getGPGId(const RsPeerId& sslid)
 	/* get from mAuthMgr */
 	if (sslid == AuthSSL::getAuthSSL()->OwnId()) 
 	{
-        return AuthGPG::getGPGOwnId();
+        return AuthPGP::getGPGOwnId();
 	}
 	peerState pcs;
 	if (mPeerMgr->getFriendNetStatus(sslid, pcs))
@@ -739,12 +739,12 @@ bool 	p3Peers::addFriend(const RsPeerId &ssl_id, const RsPgpId &gpg_id,ServicePe
 #ifdef P3PEERS_DEBUG
 	std::cerr << "p3Peers::addFriend() with : id : " << id << "; gpg_id : " << gpg_id << std::endl;
 #endif
-    if(AuthGPG::isPGPId(gpg_id))
+    if(AuthPGP::isPGPId(gpg_id))
 	{
 #ifdef P3PEERS_DEBUG
 		std::cerr << "p3Peers::addFriend() Authorising GPG Id: " << gpg_id << std::endl;
 #endif
-        if (AuthGPG::AllowConnection(gpg_id, true))
+        if (AuthPGP::AllowConnection(gpg_id, true))
 		{
 #ifdef P3PEERS_DEBUG
 			std::cerr << "p3Peers::addFriend() Authorization OK." << std::endl;
@@ -797,7 +797,7 @@ bool p3Peers::addSslOnlyFriend( const RsPeerId& sslId, const RsPgpId& pgp_id,con
 
 bool 	p3Peers::removeKeysFromPGPKeyring(const std::set<RsPgpId>& pgp_ids,std::string& backup_file,uint32_t& error_code)
 {
-    return AuthGPG::removeKeysFromPGPKeyring(pgp_ids,backup_file,error_code) ;
+    return AuthPGP::removeKeysFromPGPKeyring(pgp_ids,backup_file,error_code) ;
 }
 
 bool 	p3Peers::removeFriendLocation(const RsPeerId &sslId)
@@ -817,7 +817,7 @@ bool 	p3Peers::removeFriend(const RsPgpId& gpgId)
 #ifdef P3PEERS_DEBUG
 	std::cerr << "p3Peers::removeFriend() " << gpgId << std::endl;
 #endif
-    if (gpgId == AuthGPG::getGPGOwnId()) {
+    if (gpgId == AuthPGP::getGPGOwnId()) {
         std::cerr << "p3Peers::removeFriend() ERROR  we're not going to remove our own GPG id."  << std::endl;
 		return false;
 	}
@@ -825,7 +825,7 @@ bool 	p3Peers::removeFriend(const RsPgpId& gpgId)
 #ifdef P3PEERS_DEBUG
 	std::cerr << "p3Peers::removeFriend() Removing GPG Id: " << gpgId << std::endl;
 #endif
-    if (AuthGPG::AllowConnection(gpgId, false))
+    if (AuthPGP::AllowConnection(gpgId, false))
 	{
 #ifdef P3PEERS_DEBUG
 		std::cerr << "p3Peers::removeFriend() OK." << std::endl;
@@ -1107,7 +1107,7 @@ std::string p3Peers::getPGPKey(const RsPgpId& pgp_id,bool include_signatures)
 	rs_owner_ptr<unsigned char> mem_block = nullptr;
 	size_t mem_block_size = 0;
 
-    if( !AuthGPG::exportPublicKey( RsPgpId(pgp_id), mem_block, mem_block_size, false, include_signatures ) )
+    if( !AuthPGP::exportPublicKey( RsPgpId(pgp_id), mem_block, mem_block_size, false, include_signatures ) )
 	{
 		RsErr() << __PRETTY_FUNCTION__
 		        << " Failure retriving certificate for id " << pgp_id
@@ -1138,7 +1138,7 @@ bool p3Peers::GetPGPBase64StringAndCheckSum(
 
 	rs_owner_ptr<unsigned char> mem_block = nullptr;
 	size_t mem_block_size = 0;
-    if(!AuthGPG::exportPublicKey( gpg_id,mem_block,mem_block_size,false,false ))
+    if(!AuthPGP::exportPublicKey( gpg_id,mem_block,mem_block_size,false,false ))
 		return false;
 
 	RsBase64::encode(mem_block, mem_block_size, gpg_base64_string, true, false);
@@ -1598,7 +1598,7 @@ std::string p3Peers::GetRetroshareInvite( const RsPeerId& sslId, RetroshareInvit
 		unsigned char *mem_block = nullptr;
 		size_t mem_block_size = 0;
 
-        if(!AuthGPG::exportPublicKey( RsPgpId(detail.gpg_id), mem_block, mem_block_size, false, !!(invite_flags & RetroshareInviteFlags::PGP_SIGNATURES) ))
+        if(!AuthPGP::exportPublicKey( RsPgpId(detail.gpg_id), mem_block, mem_block_size, false, !!(invite_flags & RetroshareInviteFlags::PGP_SIGNATURES) ))
 		{
 			std::cerr << "Cannot output certificate for id \"" << detail.gpg_id
 			          << "\". Sorry." << std::endl;
@@ -1634,7 +1634,7 @@ bool p3Peers::loadCertificateFromString(
 	}
 
 	RsPgpId gpgid;
-    bool res = AuthGPG::LoadCertificateFromString( crt->armouredPGPKey(), gpgid, error_string );
+    bool res = AuthPGP::LoadCertificateFromString( crt->armouredPGPKey(), gpgid, error_string );
 
 	gpg_id = gpgid;
 	ssl_id = crt->sslid();
@@ -1651,7 +1651,7 @@ bool p3Peers::loadCertificateFromString(
 }
 bool p3Peers::loadPgpKeyFromBinaryData( const unsigned char *bin_key_data,uint32_t bin_key_len, RsPgpId& gpg_id, std::string& error_string )
 {
-    bool res = AuthGPG::LoadPGPKeyFromBinaryData( bin_key_data,bin_key_len, gpg_id, error_string );
+    bool res = AuthPGP::LoadPGPKeyFromBinaryData( bin_key_data,bin_key_len, gpg_id, error_string );
 
     if(res)
 		mPeerMgr->notifyPgpKeyReceived(gpg_id);
@@ -1670,7 +1670,7 @@ bool p3Peers::loadDetailsFromStringCert( const std::string &certstr,
 
 	RsCertificate& cert = *certPtr;
 
-    if(!AuthGPG::getGPGDetailsFromBinaryBlock( cert.pgp_key(), cert.pgp_key_size(), pd.gpg_id, pd.name, pd.gpgSigners ))
+    if(!AuthPGP::getGPGDetailsFromBinaryBlock( cert.pgp_key(), cert.pgp_key_size(), pd.gpg_id, pd.name, pd.gpgSigners ))
 		return false;
 
 	Dbg4() << __PRETTY_FUNCTION__ << " Parsing cert for sslid, location, ext "
@@ -1748,7 +1748,7 @@ bool 	p3Peers::signGPGCertificate(const RsPgpId &id, const std::string &gpg_pass
         rsNotify->cachePgpPassphrase(gpg_passphrase);
         rsNotify->setDisableAskPassword(true);
 
-        bool res = AuthGPG::SignCertificateLevel0(id);
+        bool res = AuthPGP::SignCertificateLevel0(id);
 
         rsNotify->clearPgpPassphrase();
         rsNotify->setDisableAskPassword(false);
@@ -1762,7 +1762,7 @@ bool 	p3Peers::trustGPGCertificate(const RsPgpId &id, uint32_t trustlvl)
 	std::cerr << "p3Peers::TrustCertificate() " << id;
 	std::cerr << std::endl;
 #endif
-    return AuthGPG::TrustCertificate(id, trustlvl);
+    return AuthPGP::TrustCertificate(id, trustlvl);
 }
 
 	/* Group Stuff */
diff --git a/libretroshare/src/rsserver/p3serverconfig.cc b/libretroshare/src/rsserver/p3serverconfig.cc
index 7abb1e6da..2aa859fe1 100644
--- a/libretroshare/src/rsserver/p3serverconfig.cc
+++ b/libretroshare/src/rsserver/p3serverconfig.cc
@@ -140,7 +140,7 @@ bool p3ServerConfig::setConfigurationOption(uint32_t key, const std::string &opt
 int 	p3ServerConfig::getConfigNetStatus(RsConfigNetStatus &status)
 {
 	status.ownId = AuthSSL::getAuthSSL()->OwnId();
-    status.ownName = AuthGPG::getGPGOwnName();
+    status.ownName = AuthPGP::getGPGOwnName();
 
 	// Details from PeerMgr.
 	peerState pstate;
diff --git a/libretroshare/src/rsserver/rsaccounts.cc b/libretroshare/src/rsserver/rsaccounts.cc
index 2bf306449..83867b943 100644
--- a/libretroshare/src/rsserver/rsaccounts.cc
+++ b/libretroshare/src/rsserver/rsaccounts.cc
@@ -701,10 +701,10 @@ static bool checkAccount(const std::string &accountdir, AccountDetails &account,
 		if(! RsAccounts::GetPGPLoginDetails(account.mPgpId, account.mPgpName, account.mPgpEmail))
 			return false ;
 
-        if(!AuthGPG::haveSecretKey(account.mPgpId))
+        if(!AuthPGP::haveSecretKey(account.mPgpId))
 			return false ;
 
-        if(!AuthGPG::isKeySupported(account.mPgpId))
+        if(!AuthPGP::isKeySupported(account.mPgpId))
 		{
 			std::string keystring = account.mPgpId.toStdString() + " " + account.mPgpName + "&#60;" + account.mPgpEmail ;
 			unsupported_keys[keystring].push_back("Location: " + account.mLocation + "&nbsp;&nbsp;(" + account.mSslId.toStdString() + ")") ;
@@ -853,7 +853,7 @@ static bool checkAccount(const std::string &accountdir, AccountDetails &account,
                 /* Generating GPGme Account */
 int      RsAccountsDetail::GetPGPLogins(std::list<RsPgpId>& pgpIds)
 {
-    AuthGPG::availableGPGCertificatesWithPrivateKeys(pgpIds);
+    AuthPGP::availableGPGCertificatesWithPrivateKeys(pgpIds);
     return 1;
 }
 
@@ -864,10 +864,10 @@ int      RsAccountsDetail::GetPGPLoginDetails(const RsPgpId& id, std::string &na
         #endif
 
 		  bool ok = true ;
-        name = AuthGPG::getGPGName(id,&ok);
+        name = AuthPGP::getGPGName(id,&ok);
 		  if(!ok)
 			  return 0 ;
-        email = AuthGPG::getGPGEmail(id,&ok);
+        email = AuthPGP::getGPGEmail(id,&ok);
 		  if(!ok)
 			  return 0 ;
 
@@ -887,7 +887,7 @@ bool RsAccountsDetail::SelectPGPAccount(const RsPgpId& pgpId)
 {
 	bool retVal = false;
 
-    if (0 < AuthGPG::GPGInit(pgpId))
+    if (0 < AuthPGP::GPGInit(pgpId))
 	{
 		retVal = true;
 #ifdef DEBUG_ACCOUNTS
@@ -907,7 +907,7 @@ bool RsAccountsDetail::SelectPGPAccount(const RsPgpId& pgpId)
 
 bool     RsAccountsDetail::GeneratePGPCertificate(const std::string& name, const std::string& email, const std::string& passwd, RsPgpId &pgpId, const int keynumbits, std::string &errString)
 {
-    return AuthGPG::GeneratePGPCertificate(name, email, passwd, pgpId, keynumbits, errString);
+    return AuthPGP::GeneratePGPCertificate(name, email, passwd, pgpId, keynumbits, errString);
 }
 
 		// PGP Support Functions.
@@ -919,24 +919,24 @@ void RsAccountsDetail::getUnsupportedKeys(std::map<std::string,std::vector<std::
 
 bool RsAccountsDetail::exportIdentity(const std::string& fname,const RsPgpId& id)
 {
-    return AuthGPG::exportProfile(fname,id);
+    return AuthPGP::exportProfile(fname,id);
 }
 
 bool RsAccountsDetail::importIdentity(const std::string& fname,RsPgpId& id,std::string& import_error)
 {
-    return AuthGPG::importProfile(fname,id,import_error);
+    return AuthPGP::importProfile(fname,id,import_error);
 }
 
 bool RsAccountsDetail::importIdentityFromString(const std::string &data, RsPgpId &imported_pgp_id, std::string &import_error)
 {
-    return AuthGPG::importProfileFromString(data, imported_pgp_id, import_error);
+    return AuthPGP::importProfileFromString(data, imported_pgp_id, import_error);
 }
 
 bool RsAccountsDetail::exportIdentityToString(
         std::string& data, const RsPgpId& pgpId, bool includeSignatures,
         std::string& errorMsg )
 {
-    return AuthGPG::exportIdentityToString(
+    return AuthPGP::exportIdentityToString(
 	            data, pgpId, includeSignatures, errorMsg );
 }
 
@@ -1296,7 +1296,7 @@ bool RsAccounts::init(const std::string& opt_base_dir,int& error_code)
 	if(!RsDirUtil::checkCreateDirectory(pgp_dir))
 		throw std::runtime_error("Cannot create pgp directory " + pgp_dir) ;
 
-	AuthGPG::init(	pgp_dir + "/retroshare_public_keyring.gpg",
+	AuthPGP::init(	pgp_dir + "/retroshare_public_keyring.gpg",
 	                pgp_dir + "/retroshare_secret_keyring.gpg",
 	                pgp_dir + "/retroshare_trustdb.gpg",
 	                pgp_dir + "/lock");
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 6b12152fc..eb2b07790 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -510,7 +510,7 @@ RsInit::LoadCertificateStatus RsInit::LockAndLoadCertificates(
 		if(!RsAccounts::GetAccountDetails(accountId, pgpId, pgpName, pgpEmail, location))
 			throw RsInit::ERR_UNKNOWN; // invalid PreferredAccount;
 
-        if(0 == AuthGPG::GPGInit(pgpId))
+        if(0 == AuthPGP::GPGInit(pgpId))
 			throw RsInit::ERR_UNKNOWN; // PGP Error.
 
 		LoadCertificateStatus retVal =
@@ -910,8 +910,8 @@ int RsServer::StartupRetroShare()
 	/* History Manager */
 	mHistoryMgr = new p3HistoryMgr();
 	mPeerMgr = new p3PeerMgrIMPL( AuthSSL::getAuthSSL()->OwnId(),
-                AuthGPG::getGPGOwnId(),
-                AuthGPG::getGPGOwnName(),
+                AuthPGP::getGPGOwnId(),
+                AuthPGP::getGPGOwnName(),
 				AuthSSL::getAuthSSL()->getOwnLocation());
 	mNetMgr = new p3NetMgrIMPL();
 	mLinkMgr = new p3LinkMgrIMPL(mPeerMgr, mNetMgr);
@@ -1604,7 +1604,7 @@ int RsServer::StartupRetroShare()
 
 	//mConfigMgr->addConfiguration("ftserver.cfg", ftserver);
 	//
-    AuthGPG::registerToConfigMgr(std::string("gpg_prefs.cfg"),mConfigMgr);
+    AuthPGP::registerToConfigMgr(std::string("gpg_prefs.cfg"),mConfigMgr);
 
 	mConfigMgr->addConfiguration("gxsnettunnel.cfg", mGxsNetTunnel);
 	mConfigMgr->addConfiguration("peers.cfg"       , mPeerMgr);
diff --git a/libretroshare/src/rsserver/rsloginhandler.cc b/libretroshare/src/rsserver/rsloginhandler.cc
index 67b863931..a0834b0af 100644
--- a/libretroshare/src/rsserver/rsloginhandler.cc
+++ b/libretroshare/src/rsserver/rsloginhandler.cc
@@ -60,7 +60,7 @@ bool RsLoginHandler::checkAndStoreSSLPasswdIntoGPGFile(
 		return true ;
 	}
 
-    bool ok = AuthGPG::encryptTextToFile( ssl_passwd, getSSLPasswdFileName(ssl_id));
+    bool ok = AuthPGP::encryptTextToFile( ssl_passwd, getSSLPasswdFileName(ssl_id));
 
 	if (!ok) std::cerr << "Encrypting went wrong !" << std::endl;
 
@@ -89,7 +89,7 @@ bool RsLoginHandler::getSSLPasswdFromGPGFile(const RsPeerId& ssl_id,std::string&
 #endif
 
 	std::string plain;
-    if ( AuthGPG::decryptTextFromFile( plain, getSSLPasswdFileName(ssl_id)) )
+    if ( AuthPGP::decryptTextFromFile( plain, getSSLPasswdFileName(ssl_id)) )
 	{
 		sslPassword = plain;
 #ifdef DEBUG_RSLOGINHANDLER
diff --git a/libretroshare/src/services/p3idservice.cc b/libretroshare/src/services/p3idservice.cc
index 981c246c4..49bfc36dc 100644
--- a/libretroshare/src/services/p3idservice.cc
+++ b/libretroshare/src/services/p3idservice.cc
@@ -1067,7 +1067,7 @@ bool p3IdService::createIdentity(uint32_t& token, RsIdentityParameters &params)
 
     if(params.isPgpLinked)
     {
-        ssdata.pgp.pgpId = AuthGPG::getGPGOwnId();
+        ssdata.pgp.pgpId = AuthPGP::getGPGOwnId();
         ssdata.pgp.lastCheckTs = time(nullptr);
     }
 
@@ -3619,7 +3619,7 @@ RsGenExchange::ServiceCreate_Return p3IdService::service_CreateGroup(
 		unsigned int sign_size = MAX_SIGN_SIZE;
         memset(signarray,0,MAX_SIGN_SIZE) ;	// just in case.
 
-        int	result = AuthGPG::SignDataBin(
+        int	result = AuthPGP::SignDataBin(
 			            static_cast<const void*>(hash.toByteArray()),
 			            hash.SIZE_IN_BYTES, signarray, &sign_size,
 			            __PRETTY_FUNCTION__ )