diff --git a/test/ErrorHandler.cpp b/test/ErrorHandlerTests.cpp
similarity index 100%
rename from test/ErrorHandler.cpp
rename to test/ErrorHandlerTests.cpp
diff --git a/test/Helpers/CRCHelper.cpp b/test/Helpers/CRCHelperTests.cpp
similarity index 100%
rename from test/Helpers/CRCHelper.cpp
rename to test/Helpers/CRCHelperTests.cpp
diff --git a/test/Helpers/PacketStore.cpp b/test/Helpers/PacketStoreTests.cpp
similarity index 100%
rename from test/Helpers/PacketStore.cpp
rename to test/Helpers/PacketStoreTests.cpp
diff --git a/test/Helpers/Statistic.cpp b/test/Helpers/StatisticTests.cpp
similarity index 100%
rename from test/Helpers/Statistic.cpp
rename to test/Helpers/StatisticTests.cpp
diff --git a/test/MessageParser.cpp b/test/MessageParserTests.cpp
similarity index 100%
rename from test/MessageParser.cpp
rename to test/MessageParserTests.cpp
diff --git a/test/Message.cpp b/test/MessageTests.cpp
similarity index 100%
rename from test/Message.cpp
rename to test/MessageTests.cpp
diff --git a/test/Services/EventActionService.cpp b/test/Services/EventActionServiceTests.cpp
similarity index 100%
rename from test/Services/EventActionService.cpp
rename to test/Services/EventActionServiceTests.cpp
diff --git a/test/Services/EventReportService.cpp b/test/Services/EventReportServiceTests.cpp
similarity index 100%
rename from test/Services/EventReportService.cpp
rename to test/Services/EventReportServiceTests.cpp
diff --git a/test/Services/FunctionManagementService.cpp b/test/Services/FunctionManagementServiceTests.cpp
similarity index 100%
rename from test/Services/FunctionManagementService.cpp
rename to test/Services/FunctionManagementServiceTests.cpp
diff --git a/test/Services/HousekeepingService.cpp b/test/Services/HousekeepingServiceTests.cpp
similarity index 100%
rename from test/Services/HousekeepingService.cpp
rename to test/Services/HousekeepingServiceTests.cpp
diff --git a/test/Services/LargePacketTransferService.cpp b/test/Services/LargePacketTransferServiceTests.cpp
similarity index 100%
rename from test/Services/LargePacketTransferService.cpp
rename to test/Services/LargePacketTransferServiceTests.cpp
diff --git a/test/Services/MemoryManagementService.cpp b/test/Services/MemoryManagementServiceTests.cpp
similarity index 100%
rename from test/Services/MemoryManagementService.cpp
rename to test/Services/MemoryManagementServiceTests.cpp
diff --git a/test/Services/OnBoardMonitoringService.cpp b/test/Services/OnBoardMonitoringServiceTests.cpp
similarity index 100%
rename from test/Services/OnBoardMonitoringService.cpp
rename to test/Services/OnBoardMonitoringServiceTests.cpp
diff --git a/test/Services/ParameterService.cpp b/test/Services/ParameterServiceTests.cpp
similarity index 100%
rename from test/Services/ParameterService.cpp
rename to test/Services/ParameterServiceTests.cpp
diff --git a/test/Services/ParameterStatisticsService.cpp b/test/Services/ParameterStatisticsServiceTests.cpp
similarity index 100%
rename from test/Services/ParameterStatisticsService.cpp
rename to test/Services/ParameterStatisticsServiceTests.cpp
diff --git a/test/Services/RequestVerificationService.cpp b/test/Services/RequestVerificationServiceTests.cpp
similarity index 100%
rename from test/Services/RequestVerificationService.cpp
rename to test/Services/RequestVerificationServiceTests.cpp
diff --git a/test/Services/StorageAndRetrievalService.cpp b/test/Services/StorageAndRetrievalServiceTests.cpp
similarity index 100%
rename from test/Services/StorageAndRetrievalService.cpp
rename to test/Services/StorageAndRetrievalServiceTests.cpp
diff --git a/test/Services/TestService.cpp b/test/Services/TestServiceTests.cpp
similarity index 100%
rename from test/Services/TestService.cpp
rename to test/Services/TestServiceTests.cpp
diff --git a/test/Services/TimeBasedSchedulingService.cpp b/test/Services/TimeBasedSchedulingServiceTests.cpp
similarity index 100%
rename from test/Services/TimeBasedSchedulingService.cpp
rename to test/Services/TimeBasedSchedulingServiceTests.cpp