diff --git a/libretroshare/src/rsserver/rsaccounts.cc b/libretroshare/src/rsserver/rsaccounts.cc
index 13f03d911..d6aeb0845 100644
--- a/libretroshare/src/rsserver/rsaccounts.cc
+++ b/libretroshare/src/rsserver/rsaccounts.cc
@@ -302,9 +302,8 @@ bool RsAccountsDetail::defaultBaseDirectory()
 		return false ;
 	}
 
-	// TODO change back to .retroshare after testing.
 	basedir = h;
-	basedir += "/.retroshare6";
+	basedir += "/.retroshare";
 
 #else
 	if (RsInit::isPortable())
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 204a01ded..2eeedaf5e 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -1301,8 +1301,6 @@ int RsServer::StartupRetroShare()
 #ifdef RS_ENABLE_GXS
 
 	std::string currGxsDir = rsAccounts.PathAccountDirectory() + "/gxs";
-        currGxsDir += "_FINALTESTS";
-
         RsDirUtil::checkCreateDirectory(currGxsDir);
 
         RsNxsNetMgr* nxsMgr =  new RsNxsNetMgrImpl(serviceCtrl);