--- a/UnitTestsSources/FileStorageTests.cpp	Wed Mar 28 14:18:02 2018 +0200
+++ b/UnitTestsSources/FileStorageTests.cpp	Wed Mar 28 15:20:50 2018 +0200
@@ -61,8 +61,8 @@
 {
   FilesystemStorage s("UnitTestsStorage");
 
-  std::string data = SystemToolbox::GenerateUuid();
-  std::string uid = SystemToolbox::GenerateUuid();
+  std::string data = Toolbox::GenerateUuid();
+  std::string uid = Toolbox::GenerateUuid();
   s.Create(uid.c_str(), &data[0], data.size(), FileContentType_Unknown);
   std::string d;
   s.Read(d, uid, FileContentType_Unknown);
@@ -76,8 +76,8 @@
   FilesystemStorage s("UnitTestsStorage");
 
   std::vector<uint8_t> data;
-  StringToVector(data, SystemToolbox::GenerateUuid());
-  std::string uid = SystemToolbox::GenerateUuid();
+  StringToVector(data, Toolbox::GenerateUuid());
+  std::string uid = Toolbox::GenerateUuid();
   s.Create(uid.c_str(), &data[0], data.size(), FileContentType_Unknown);
   std::string d;
   s.Read(d, uid, FileContentType_Unknown);
@@ -94,8 +94,8 @@
   std::list<std::string> u;
   for (unsigned int i = 0; i < 10; i++)
   {
-    std::string t = SystemToolbox::GenerateUuid();
-    std::string uid = SystemToolbox::GenerateUuid();
+    std::string t = Toolbox::GenerateUuid();
+    std::string uid = Toolbox::GenerateUuid();
     s.Create(uid.c_str(), &t[0], t.size(), FileContentType_Unknown);
     u.push_back(uid);
   }