diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py
index 1d9b7ce79..4cc37e269 100644
--- a/monkey/monkey_island/cc/app.py
+++ b/monkey/monkey_island/cc/app.py
@@ -37,9 +37,9 @@ from monkey_island.cc.resources.T1216_pba_file_download import T1216PBAFileDownl
 from monkey_island.cc.resources.telemetry import Telemetry
 from monkey_island.cc.resources.telemetry_feed import TelemetryFeed
 from monkey_island.cc.resources.test.clear_caches import ClearCaches
-from monkey_island.cc.resources.test.log_test import LogTest
-from monkey_island.cc.resources.test.monkey_test import MonkeyTest
-from monkey_island.cc.resources.test.telemetry_test import TelemetryTest
+from monkey_island.cc.resources.test.log_test_endpoint import LogTestEndpoint
+from monkey_island.cc.resources.test.monkey_test_endpoint import MonkeyTestEndpoint
+from monkey_island.cc.resources.test.telemetry_test_endpoint import TelemetryTestEndpoint
 from monkey_island.cc.resources.version_update import VersionUpdate
 from monkey_island.cc.resources.zero_trust.finding_event import ZeroTrustFindingEvent
 from monkey_island.cc.resources.zero_trust.scoutsuite_auth.aws_keys import AWSKeys
@@ -165,10 +165,10 @@ def init_api_resources(api):
     api.add_resource(AWSKeys, "/api/aws_keys")
 
     # Resources used by black box tests
-    api.add_resource(MonkeyTest, "/api/test/monkey")
+    api.add_resource(MonkeyTestEndpoint, "/api/test/monkey")
     api.add_resource(ClearCaches, "/api/test/clear_caches")
-    api.add_resource(LogTest, "/api/test/log")
-    api.add_resource(TelemetryTest, "/api/test/telemetry")
+    api.add_resource(LogTestEndpoint, "/api/test/log")
+    api.add_resource(TelemetryTestEndpoint, "/api/test/telemetry")
 
 
 def init_app(mongo_url):
diff --git a/monkey/monkey_island/cc/resources/test/test_log.py b/monkey/monkey_island/cc/resources/test/log_test_endpoint.py
similarity index 91%
rename from monkey/monkey_island/cc/resources/test/test_log.py
rename to monkey/monkey_island/cc/resources/test/log_test_endpoint.py
index 9332d71f8..26868a289 100644
--- a/monkey/monkey_island/cc/resources/test/test_log.py
+++ b/monkey/monkey_island/cc/resources/test/log_test_endpoint.py
@@ -6,7 +6,7 @@ from monkey_island.cc.database import database, mongo
 from monkey_island.cc.resources.auth.auth import jwt_required
 
 
-class TestLog(flask_restful.Resource):
+class LogTestEndpoint(flask_restful.Resource):
     @jwt_required
     def get(self):
         find_query = json_util.loads(request.args.get("find_query"))
diff --git a/monkey/monkey_island/cc/resources/test/test_monkey.py b/monkey/monkey_island/cc/resources/test/monkey_test_endpoint.py
similarity index 87%
rename from monkey/monkey_island/cc/resources/test/test_monkey.py
rename to monkey/monkey_island/cc/resources/test/monkey_test_endpoint.py
index 5eddc61ac..903331280 100644
--- a/monkey/monkey_island/cc/resources/test/test_monkey.py
+++ b/monkey/monkey_island/cc/resources/test/monkey_test_endpoint.py
@@ -6,7 +6,7 @@ from monkey_island.cc.database import mongo
 from monkey_island.cc.resources.auth.auth import jwt_required
 
 
-class TestMonkey(flask_restful.Resource):
+class MonkeyTestEndpoint(flask_restful.Resource):
     @jwt_required
     def get(self, **kw):
         find_query = json_util.loads(request.args.get("find_query"))
diff --git a/monkey/monkey_island/cc/resources/test/test_telemetry.py b/monkey/monkey_island/cc/resources/test/telemetry_test_endpoint.py
similarity index 87%
rename from monkey/monkey_island/cc/resources/test/test_telemetry.py
rename to monkey/monkey_island/cc/resources/test/telemetry_test_endpoint.py
index f929988ac..0321bb86b 100644
--- a/monkey/monkey_island/cc/resources/test/test_telemetry.py
+++ b/monkey/monkey_island/cc/resources/test/telemetry_test_endpoint.py
@@ -6,7 +6,7 @@ from monkey_island.cc.database import mongo
 from monkey_island.cc.resources.auth.auth import jwt_required
 
 
-class TestTelemetry(flask_restful.Resource):
+class TelemetryTestEndpoint(flask_restful.Resource):
     @jwt_required
     def get(self, **kw):
         find_query = json_util.loads(request.args.get("find_query"))