diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 63df923b6..66bcc5b3f 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -1361,7 +1361,7 @@ int RsServer::StartupRetroShare()
 	std::string currGxsDir = rsAccounts.PathAccountDirectory() + "/GXS_phase2";
 
 #ifdef GXS_DEV_TESTNET // Different Directory for testing.
-	currGxsDir += "_TESTNET9";
+	currGxsDir += "_TESTNET10";
 #endif
 
         if(!priorGxsDir.empty())
diff --git a/libretroshare/src/serialiser/rsgxsreputationitems.h b/libretroshare/src/serialiser/rsgxsreputationitems.h
index 79f7bf112..ffcb22e2a 100644
--- a/libretroshare/src/serialiser/rsgxsreputationitems.h
+++ b/libretroshare/src/serialiser/rsgxsreputationitems.h
@@ -31,6 +31,7 @@
 #include "serialiser/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvtypes.h"
+#include "retroshare/rsgxsifacetypes.h"
 
 #define RS_PKT_SUBTYPE_GXSREPUTATION_CONFIG_ITEM 	0x01
 #define RS_PKT_SUBTYPE_GXSREPUTATION_SET_ITEM 		0x02
@@ -96,7 +97,7 @@ virtual ~RsGxsReputationUpdateItem();
 virtual void clear();  
 std::ostream &print(std::ostream &out, uint16_t indent = 0);
 
-	std::map<std::string, uint32_t> mOpinions; // GxsId -> Opinion.
+	std::map<RsGxsId, uint32_t> mOpinions; // GxsId -> Opinion.
 	uint32_t mLatestUpdate; 
 };
 
diff --git a/libretroshare/src/services/p3gxsreputation.cc b/libretroshare/src/services/p3gxsreputation.cc
index 87113e030..1e536d82b 100644
--- a/libretroshare/src/services/p3gxsreputation.cc
+++ b/libretroshare/src/services/p3gxsreputation.cc
@@ -256,7 +256,7 @@ bool p3GxsReputation::SendReputations(RsGxsReputationRequestItem *request)
 			continue;
 		}
 
-		std::string gxsId = rit->first.toStdString();
+		RsGxsId gxsId = rit->first;
 		pkt->mOpinions[gxsId] = ConvertToSerialised(rit->second.mOwnOpinion, true);
 		pkt->mLatestUpdate = rit->second.mOwnOpinionTs;
 		if (pkt->mLatestUpdate == (uint32_t) now)
@@ -307,7 +307,7 @@ bool p3GxsReputation::RecvReputations(RsGxsReputationUpdateItem *item)
 
 	RsPeerId peerid = item->PeerId();
 
-	std::map<std::string, uint32_t>::iterator it;
+	std::map<RsGxsId, uint32_t>::iterator it;
 	for(it = item->mOpinions.begin(); it != item->mOpinions.end(); it++)
 	{
 		RsStackMutex stack(mReputationMtx); /****** LOCKED MUTEX *******/
diff --git a/libretroshare/src/services/p3gxsreputation.h b/libretroshare/src/services/p3gxsreputation.h
index 0fe3c3e0c..1761941f8 100644
--- a/libretroshare/src/services/p3gxsreputation.h
+++ b/libretroshare/src/services/p3gxsreputation.h
@@ -37,7 +37,6 @@
 #include "retroshare/rsidentity.h"
 #include "services/p3service.h"
 
-//typedef std::string RsPeerId;
 
 class p3LinkMgr;
 
diff --git a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
index c93c56b38..5c508bc75 100644
--- a/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
+++ b/retroshare-gui/src/gui/Circles/CreateCircleDialog.cpp
@@ -391,7 +391,7 @@ void CreateCircleDialog::updateCircleGUI()
 			std::cerr << "CreateCircleDialog::updateCircleGUI() : EXTERNAL CIRCLETYPE";
 			std::cerr << std::endl;
 
-			if (mCircleGroup.mMeta.mCircleId == mCircleGroup.mMeta.mGroupId)
+			if (mCircleGroup.mMeta.mCircleId.toStdString() == mCircleGroup.mMeta.mGroupId.toStdString())
 			{
 				ui.radioButton_Restricted->setChecked(true);
 			}
diff --git a/retroshare-gui/src/gui/Identity/IdDialog.cpp b/retroshare-gui/src/gui/Identity/IdDialog.cpp
index 444495be5..670362300 100644
--- a/retroshare-gui/src/gui/Identity/IdDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdDialog.cpp
@@ -548,7 +548,7 @@ void IdDialog::modifyReputation()
 	std::cerr << "IdDialog::modifyReputation()";
 	std::cerr << std::endl;
 
-	std::string id = ui.lineEdit_KeyId->text().toStdString();
+	RsGxsId id(ui.lineEdit_KeyId->text().toStdString());
 
 	int mod = 0;
 	if (ui.repMod_Accept->isChecked())
diff --git a/retroshare-gui/src/gui/Posted/PostedListDialog.cpp b/retroshare-gui/src/gui/Posted/PostedListDialog.cpp
index f654b3383..99d91e5c6 100644
--- a/retroshare-gui/src/gui/Posted/PostedListDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedListDialog.cpp
@@ -191,10 +191,10 @@ void PostedListDialog::groupListCustomPopupMenu(QPoint /*point*/)
 	contextMnu.addSeparator();
 
 	action = contextMnu.addAction(QIcon(IMAGE_SHOW), tr("Show Topic Details"), this, SLOT(showTopic()));
-	action->setEnabled (!mCurrTopicId.empty());
+	action->setEnabled (!mCurrTopicId.isNull());
 
 	action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Topic Details"), this, SLOT(editTopic()));
-	action->setEnabled (!mCurrTopicId.empty() && IS_GROUP_ADMIN(subscribeFlags));
+	action->setEnabled (!mCurrTopicId.isNull() && IS_GROUP_ADMIN(subscribeFlags));
 
 	contextMnu.exec(QCursor::pos());
 }
@@ -378,7 +378,7 @@ void PostedListDialog::newTopic()
 	
 void PostedListDialog::showTopic()
 {
-	if (mCurrTopicId.empty()) {
+	if (mCurrTopicId.isNull()) {
 		return;
 	}
 
@@ -388,7 +388,7 @@ void PostedListDialog::showTopic()
 	
 void PostedListDialog::editTopic()
 {
-	if (mCurrTopicId.empty()) {
+	if (mCurrTopicId.isNull()) {
 		return;
 	}
 
diff --git a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
index 3ab2ac09f..f2e7cf1bc 100644
--- a/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
+++ b/retroshare-gui/src/gui/WikiPoos/WikiDialog.cpp
@@ -633,7 +633,7 @@ void WikiDialog::groupListCustomPopupMenu(QPoint /*point*/)
 	contextMnu.addSeparator();
 
 	action = contextMnu.addAction(QIcon(IMAGE_INFO), tr("Show Wiki Group"), this, SLOT(showGroupDetails()));
-	action->setEnabled (!mGroupId.empty ());
+	action->setEnabled (!mGroupId.isNull());
 
 	action = contextMnu.addAction(QIcon(IMAGE_EDIT), tr("Edit Wiki Group"), this, SLOT(editGroupDetails()));
     action->setEnabled (!mGroupId.isNull() && IS_GROUP_ADMIN(subscribeFlags));
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
index e4824133a..4675b0b37 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
@@ -370,7 +370,7 @@ void GxsChannelDialog::openChat(const RsPeerId & /*peerId*/)
 
 void GxsChannelDialog::editChannelDetail()
 {
-       if (mChannelId.empty()) {
+       if (mChannelId.isNull()) {
                return;
        }
 
@@ -799,7 +799,7 @@ void GxsChannelDialog::subscribeChannel()
 
 void GxsChannelDialog::showChannelDetails()
 {
-       if (mChannelId.empty()) {
+       if (mChannelId.isNull()) {
                return;
        }