diff --git a/libs/network/test/uri/CMakeLists.txt b/libs/network/test/uri/CMakeLists.txt
index 0875c5209..ad899b1e7 100644
--- a/libs/network/test/uri/CMakeLists.txt
+++ b/libs/network/test/uri/CMakeLists.txt
@@ -8,11 +8,11 @@ include_directories(${CPP-NETLIB_SOURCE_DIR})
 if (Boost_FOUND)
     set(
         TESTS
-        url_test
-        url_builder_test
-        url_builder_stream_test
-        url_encoding_test
-        relative_url_test
+        uri_test
+        uri_builder_test
+        uri_builder_stream_test
+        uri_encoding_test
+        relative_uri_test
         )
     foreach (test ${TESTS})
         if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU)
diff --git a/libs/network/test/uri/relative_url_test.cpp b/libs/network/test/uri/relative_uri_test.cpp
similarity index 100%
rename from libs/network/test/uri/relative_url_test.cpp
rename to libs/network/test/uri/relative_uri_test.cpp
diff --git a/libs/network/test/uri/url_builder_stream_test.cpp b/libs/network/test/uri/uri_builder_stream_test.cpp
similarity index 100%
rename from libs/network/test/uri/url_builder_stream_test.cpp
rename to libs/network/test/uri/uri_builder_stream_test.cpp
diff --git a/libs/network/test/uri/url_builder_test.cpp b/libs/network/test/uri/uri_builder_test.cpp
similarity index 100%
rename from libs/network/test/uri/url_builder_test.cpp
rename to libs/network/test/uri/uri_builder_test.cpp
diff --git a/libs/network/test/uri/url_encoding_test.cpp b/libs/network/test/uri/uri_encoding_test.cpp
similarity index 100%
rename from libs/network/test/uri/url_encoding_test.cpp
rename to libs/network/test/uri/uri_encoding_test.cpp
diff --git a/libs/network/test/uri/url_test.cpp b/libs/network/test/uri/uri_test.cpp
similarity index 100%
rename from libs/network/test/uri/url_test.cpp
rename to libs/network/test/uri/uri_test.cpp