diff --git a/services/tunnelbroker/src/Amqp/AmqpManager.cpp b/services/tunnelbroker/src/Amqp/AmqpManager.cpp
--- a/services/tunnelbroker/src/Amqp/AmqpManager.cpp
+++ b/services/tunnelbroker/src/Amqp/AmqpManager.cpp
@@ -87,7 +87,7 @@
 
 void AmqpManager::connect() {
   while (true) {
-    long long currentTimestamp = getCurrentTimestamp();
+    long long currentTimestamp = tools::getCurrentTimestamp();
     if (this->lastConnectionTimestamp &&
         currentTimestamp - this->lastConnectionTimestamp <
             AMQP_SHORTEST_RECONNECTION_ATTEMPT_INTERVAL) {
diff --git a/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.cpp b/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.cpp
--- a/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.cpp
+++ b/services/tunnelbroker/src/Service/TunnelbrokerServiceImpl.cpp
@@ -40,14 +40,15 @@
     const tunnelbroker::SessionSignatureRequest *request,
     tunnelbroker::SessionSignatureResponse *reply) {
   const std::string deviceID = request->deviceid();
-  if (!validateDeviceID(deviceID)) {
+  if (!tools::validateDeviceID(deviceID)) {
     std::cout << "gRPC: "
               << "Format validation failed for " << deviceID << std::endl;
     return grpc::Status(
         grpc::StatusCode::INVALID_ARGUMENT,
         "Format validation failed for deviceID");
   }
-  const std::string toSign = generateRandomString(SIGNATURE_REQUEST_LENGTH);
+  const std::string toSign =
+      tools::generateRandomString(SIGNATURE_REQUEST_LENGTH);
   std::shared_ptr<database::SessionSignItem> SessionSignItem =
       std::make_shared<database::SessionSignItem>(toSign, deviceID);
   database::DatabaseManager::getInstance().putSessionSignItem(*SessionSignItem);
@@ -64,7 +65,7 @@
   std::shared_ptr<database::SessionSignItem> sessionSignItem;
   std::shared_ptr<database::PublicKeyItem> publicKeyItem;
   const std::string deviceID = request->deviceid();
-  if (!validateDeviceID(deviceID)) {
+  if (!tools::validateDeviceID(deviceID)) {
     std::cout << "gRPC: "
               << "Format validation failed for " << deviceID << std::endl;
     return grpc::Status(
@@ -73,7 +74,7 @@
   }
   const std::string signature = request->signature();
   const std::string publicKey = request->publickey();
-  const std::string newSessionID = generateUUID();
+  const std::string newSessionID = tools::generateUUID();
   try {
     sessionSignItem =
         database::DatabaseManager::getInstance().findSessionSignItem(deviceID);
@@ -135,7 +136,7 @@
     google::protobuf::Empty *reply) {
   try {
     const std::string sessionID = request->sessionid();
-    if (!validateSessionID(sessionID)) {
+    if (!tools::validateSessionID(sessionID)) {
       std::cout << "gRPC: "
                 << "Format validation failed for " << sessionID << std::endl;
       return grpc::Status(
@@ -177,7 +178,7 @@
     grpc::ServerWriter<tunnelbroker::GetResponse> *writer) {
   try {
     const std::string sessionID = request->sessionid();
-    if (!validateSessionID(sessionID)) {
+    if (!tools::validateSessionID(sessionID)) {
       std::cout << "gRPC: "
                 << "Format validation failed for " << sessionID << std::endl;
       return grpc::Status(
diff --git a/services/tunnelbroker/src/Tools/Tools.h b/services/tunnelbroker/src/Tools/Tools.h
--- a/services/tunnelbroker/src/Tools/Tools.h
+++ b/services/tunnelbroker/src/Tools/Tools.h
@@ -5,6 +5,7 @@
 
 namespace comm {
 namespace network {
+namespace tools {
 
 std::string generateRandomString(std::size_t length);
 long long getCurrentTimestamp();
@@ -12,5 +13,6 @@
 std::string generateUUID();
 bool validateSessionID(std::string sessionID);
 
+} // namespace tools
 } // namespace network
 } // namespace comm
diff --git a/services/tunnelbroker/src/Tools/Tools.cpp b/services/tunnelbroker/src/Tools/Tools.cpp
--- a/services/tunnelbroker/src/Tools/Tools.cpp
+++ b/services/tunnelbroker/src/Tools/Tools.cpp
@@ -14,6 +14,7 @@
 
 namespace comm {
 namespace network {
+namespace tools {
 
 std::string generateRandomString(std::size_t length) {
   const std::string CHARACTERS =
@@ -67,5 +68,6 @@
   }
 }
 
+} // namespace tools
 } // namespace network
 } // namespace comm