diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py
index 519d57877..7467c4bdd 100644
--- a/monkey/monkey_island/cc/app.py
+++ b/monkey/monkey_island/cc/app.py
@@ -13,9 +13,11 @@ from monkey_island.cc.resources.attack.attack_report import AttackReport
 from monkey_island.cc.resources.auth.auth import Authenticate, init_jwt
 from monkey_island.cc.resources.auth.registration import Registration
 from monkey_island.cc.resources.blackbox.clear_caches import ClearCaches
-from monkey_island.cc.resources.blackbox.log_blackbox_endpoint import LogTestEndpoint
-from monkey_island.cc.resources.blackbox.monkey_blackbox_endpoint import MonkeyTestEndpoint
-from monkey_island.cc.resources.blackbox.telemetry_blackbox_endpoint import TelemetryTestEndpoint
+from monkey_island.cc.resources.blackbox.log_blackbox_endpoint import LogBlackboxEndpoint
+from monkey_island.cc.resources.blackbox.monkey_blackbox_endpoint import MonkeyBlackboxEndpoint
+from monkey_island.cc.resources.blackbox.telemetry_blackbox_endpoint import (
+    TelemetryBlackboxEndpoint,
+)
 from monkey_island.cc.resources.bootloader import Bootloader
 from monkey_island.cc.resources.client_run import ClientRun
 from monkey_island.cc.resources.edge import Edge
@@ -165,10 +167,10 @@ def init_api_resources(api):
     api.add_resource(AWSKeys, "/api/aws_keys")
 
     # Resources used by black box tests
-    api.add_resource(MonkeyTestEndpoint, "/api/test/monkey")
+    api.add_resource(MonkeyBlackboxEndpoint, "/api/test/monkey")
     api.add_resource(ClearCaches, "/api/test/clear_caches")
-    api.add_resource(LogTestEndpoint, "/api/test/log")
-    api.add_resource(TelemetryTestEndpoint, "/api/test/telemetry")
+    api.add_resource(LogBlackboxEndpoint, "/api/test/log")
+    api.add_resource(TelemetryBlackboxEndpoint, "/api/test/telemetry")
 
 
 def init_app(mongo_url):
diff --git a/monkey/monkey_island/cc/resources/blackbox/log_blackbox_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/log_blackbox_endpoint.py
index 26868a289..c101b567a 100644
--- a/monkey/monkey_island/cc/resources/blackbox/log_blackbox_endpoint.py
+++ b/monkey/monkey_island/cc/resources/blackbox/log_blackbox_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 LogTestEndpoint(flask_restful.Resource):
+class LogBlackboxEndpoint(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/blackbox/monkey_blackbox_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/monkey_blackbox_endpoint.py
index 903331280..2957fd4b9 100644
--- a/monkey/monkey_island/cc/resources/blackbox/monkey_blackbox_endpoint.py
+++ b/monkey/monkey_island/cc/resources/blackbox/monkey_blackbox_endpoint.py
@@ -6,7 +6,7 @@ from monkey_island.cc.database import mongo
 from monkey_island.cc.resources.auth.auth import jwt_required
 
 
-class MonkeyTestEndpoint(flask_restful.Resource):
+class MonkeyBlackboxEndpoint(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/blackbox/telemetry_blackbox_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/telemetry_blackbox_endpoint.py
index 0321bb86b..5573e5152 100644
--- a/monkey/monkey_island/cc/resources/blackbox/telemetry_blackbox_endpoint.py
+++ b/monkey/monkey_island/cc/resources/blackbox/telemetry_blackbox_endpoint.py
@@ -6,7 +6,7 @@ from monkey_island.cc.database import mongo
 from monkey_island.cc.resources.auth.auth import jwt_required
 
 
-class TelemetryTestEndpoint(flask_restful.Resource):
+class TelemetryBlackboxEndpoint(flask_restful.Resource):
     @jwt_required
     def get(self, **kw):
         find_query = json_util.loads(request.args.get("find_query"))