diff --git a/monkey/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py
index 564898845..519d57877 100644
--- a/monkey/monkey_island/cc/app.py
+++ b/monkey/monkey_island/cc/app.py
@@ -13,9 +13,9 @@ 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_test_endpoint import LogTestEndpoint
-from monkey_island.cc.resources.blackbox.monkey_test_endpoint import MonkeyTestEndpoint
-from monkey_island.cc.resources.blackbox.telemetry_test_endpoint import TelemetryTestEndpoint
+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.bootloader import Bootloader
 from monkey_island.cc.resources.client_run import ClientRun
 from monkey_island.cc.resources.edge import Edge
diff --git a/monkey/monkey_island/cc/resources/blackbox/log_test_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/log_blackbox_endpoint.py
similarity index 100%
rename from monkey/monkey_island/cc/resources/blackbox/log_test_endpoint.py
rename to monkey/monkey_island/cc/resources/blackbox/log_blackbox_endpoint.py
diff --git a/monkey/monkey_island/cc/resources/blackbox/monkey_test_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/monkey_blackbox_endpoint.py
similarity index 100%
rename from monkey/monkey_island/cc/resources/blackbox/monkey_test_endpoint.py
rename to monkey/monkey_island/cc/resources/blackbox/monkey_blackbox_endpoint.py
diff --git a/monkey/monkey_island/cc/resources/blackbox/telemetry_test_endpoint.py b/monkey/monkey_island/cc/resources/blackbox/telemetry_blackbox_endpoint.py
similarity index 100%
rename from monkey/monkey_island/cc/resources/blackbox/telemetry_test_endpoint.py
rename to monkey/monkey_island/cc/resources/blackbox/telemetry_blackbox_endpoint.py