diff --git a/test/backend_provider.cpp b/test/BackendProviderTest.cpp
similarity index 100%
rename from test/backend_provider.cpp
rename to test/BackendProviderTest.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e789382..f41f178 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,17 +8,17 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(Catch2)
 
-add_executable(tests builder.cpp
-  session.cpp
-  record.cpp
-  connection_pool.cpp
+add_executable(tests QueryBuilderTest.cpp
+  SessionTest.cpp
+  RecordTest.cpp
+  ConnectionPoolTest.cpp
   query.cpp
-  backend_provider.cpp
-  connection.cpp
+  BackendProviderTest.cpp
+  ConnectionTest.cpp
   models/product.hpp
-  column_generator.cpp
-  column_name_generator.cpp
-  value_generator.cpp
+  ColumnGeneratorTest.cpp
+  ColumnNameGeneratorTest.cpp
+  ValueGeneratorTest.cpp
   models/category.hpp
   models/supplier.hpp
   models/airplane.hpp
diff --git a/test/column_generator.cpp b/test/ColumnGeneratorTest.cpp
similarity index 100%
rename from test/column_generator.cpp
rename to test/ColumnGeneratorTest.cpp
diff --git a/test/column_name_generator.cpp b/test/ColumnNameGeneratorTest.cpp
similarity index 100%
rename from test/column_name_generator.cpp
rename to test/ColumnNameGeneratorTest.cpp
diff --git a/test/connection_pool.cpp b/test/ConnectionPoolTest.cpp
similarity index 100%
rename from test/connection_pool.cpp
rename to test/ConnectionPoolTest.cpp
diff --git a/test/connection.cpp b/test/ConnectionTest.cpp
similarity index 100%
rename from test/connection.cpp
rename to test/ConnectionTest.cpp
diff --git a/test/builder.cpp b/test/QueryBuilderTest.cpp
similarity index 100%
rename from test/builder.cpp
rename to test/QueryBuilderTest.cpp
diff --git a/test/record.cpp b/test/RecordTest.cpp
similarity index 100%
rename from test/record.cpp
rename to test/RecordTest.cpp
diff --git a/test/session.cpp b/test/SessionTest.cpp
similarity index 100%
rename from test/session.cpp
rename to test/SessionTest.cpp
diff --git a/test/value_generator.cpp b/test/ValueGeneratorTest.cpp
similarity index 100%
rename from test/value_generator.cpp
rename to test/ValueGeneratorTest.cpp