diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py
index 478aa7373..bbdb23e85 100644
--- a/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py
+++ b/envs/monkey_zoo/blackbox/test_configurations/depth_1_a.py
@@ -87,9 +87,9 @@ test_agent_configuration = _add_credential_collectors(test_agent_configuration)
 test_agent_configuration = _add_http_ports(test_agent_configuration)
 
 CREDENTIALS = (
-    Credentials(Username("m0nk3y"), None),
-    Credentials(None, Password("Ivrrw5zEzs")),
-    Credentials(None, Password("Xk8VDTsC")),
+    Credentials(identity=Username("m0nk3y"), secret=None),
+    Credentials(identity=None, secret=Password("Ivrrw5zEzs")),
+    Credentials(identity=None, secret=Password("Xk8VDTsC")),
 )
 
 depth_1_a_test_configuration = dataclasses.replace(noop_test_configuration)
diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py
index 109a600fc..459695010 100644
--- a/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py
+++ b/envs/monkey_zoo/blackbox/test_configurations/depth_2_a.py
@@ -42,8 +42,8 @@ test_agent_configuration = _add_subnets(test_agent_configuration)
 test_agent_configuration = _add_tcp_ports(test_agent_configuration)
 
 CREDENTIALS = (
-    Credentials(Username("m0nk3y"), None),
-    Credentials(None, Password("^NgDvY59~8")),
+    Credentials(identity=Username("m0nk3y"), secret=None),
+    Credentials(identity=None, secret=Password("^NgDvY59~8")),
 )
 
 depth_2_a_test_configuration = dataclasses.replace(noop_test_configuration)
diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py
index 049521858..6153086e4 100644
--- a/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py
+++ b/envs/monkey_zoo/blackbox/test_configurations/depth_3_a.py
@@ -56,14 +56,14 @@ test_agent_configuration = _add_subnets(test_agent_configuration)
 test_agent_configuration = _add_tcp_ports(test_agent_configuration)
 
 CREDENTIALS = (
-    Credentials(Username("m0nk3y"), None),
-    Credentials(Username("m0nk3y-user"), None),
-    Credentials(None, Password("Passw0rd!")),
-    Credentials(None, Password("3Q=(Ge(+&w]*")),
-    Credentials(None, Password("`))jU7L(w}")),
-    Credentials(None, NTHash("d0f0132b308a0c4e5d1029cc06f48692")),
-    Credentials(None, NTHash("5da0889ea2081aa79f6852294cba4a5e")),
-    Credentials(None, NTHash("50c9987a6bf1ac59398df9f911122c9b")),
+    Credentials(identity=Username("m0nk3y"), secret=None),
+    Credentials(identity=Username("m0nk3y-user"), secret=None),
+    Credentials(identity=None, secret=Password("Passw0rd!")),
+    Credentials(identity=None, secret=Password("3Q=(Ge(+&w]*")),
+    Credentials(identity=None, secret=Password("`))jU7L(w}")),
+    Credentials(identity=None, secret=NTHash("d0f0132b308a0c4e5d1029cc06f48692")),
+    Credentials(identity=None, secret=NTHash("5da0889ea2081aa79f6852294cba4a5e")),
+    Credentials(identity=None, secret=NTHash("50c9987a6bf1ac59398df9f911122c9b")),
 )
 
 depth_3_a_test_configuration = dataclasses.replace(noop_test_configuration)
diff --git a/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py b/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py
index 83e9dc785..7cbacd13b 100644
--- a/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py
+++ b/envs/monkey_zoo/blackbox/test_configurations/depth_4_a.py
@@ -49,11 +49,11 @@ test_agent_configuration = _add_subnets(test_agent_configuration)
 test_agent_configuration = _add_tcp_ports(test_agent_configuration)
 
 CREDENTIALS = (
-    Credentials(Username("m0nk3y"), None),
-    Credentials(None, Password("3Q=(Ge(+&w]*")),
-    Credentials(None, Password("`))jU7L(w}")),
-    Credentials(None, Password("prM2qsroTI")),
-    Credentials(None, Password("t67TC5ZDmz")),
+    Credentials(identity=Username("m0nk3y"), secret=None),
+    Credentials(identity=None, secret=Password("3Q=(Ge(+&w]*")),
+    Credentials(identity=None, secret=Password("`))jU7L(w}")),
+    Credentials(identity=None, secret=Password("prM2qsroTI")),
+    Credentials(identity=None, secret=Password("t67TC5ZDmz")),
 )
 
 depth_4_a_test_configuration = dataclasses.replace(noop_test_configuration)
diff --git a/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py b/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py
index f0432129d..bf8d80f10 100644
--- a/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py
+++ b/envs/monkey_zoo/blackbox/test_configurations/smb_pth.py
@@ -42,14 +42,14 @@ test_agent_configuration = _add_subnets(test_agent_configuration)
 test_agent_configuration = _add_tcp_ports(test_agent_configuration)
 
 CREDENTIALS = (
-    Credentials(Username("Administrator"), None),
-    Credentials(Username("m0nk3y"), None),
-    Credentials(Username("user"), None),
-    Credentials(None, Password("Ivrrw5zEzs")),
-    Credentials(None, Password("Password1!")),
-    Credentials(None, NTHash("d0f0132b308a0c4e5d1029cc06f48692")),
-    Credentials(None, NTHash("5da0889ea2081aa79f6852294cba4a5e")),
-    Credentials(None, NTHash("50c9987a6bf1ac59398df9f911122c9b")),
+    Credentials(identity=Username("Administrator"), secret=None),
+    Credentials(identity=Username("m0nk3y"), secret=None),
+    Credentials(identity=Username("user"), secret=None),
+    Credentials(identity=None, secret=Password("Ivrrw5zEzs")),
+    Credentials(identity=None, secret=Password("Password1!")),
+    Credentials(identity=None, secret=NTHash("d0f0132b308a0c4e5d1029cc06f48692")),
+    Credentials(identity=None, secret=NTHash("5da0889ea2081aa79f6852294cba4a5e")),
+    Credentials(identity=None, secret=NTHash("50c9987a6bf1ac59398df9f911122c9b")),
 )
 
 smb_pth_test_configuration = dataclasses.replace(noop_test_configuration)
diff --git a/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py b/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py
index dc86ee2c8..add637378 100644
--- a/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py
+++ b/envs/monkey_zoo/blackbox/test_configurations/wmi_mimikatz.py
@@ -50,11 +50,11 @@ test_agent_configuration = _add_tcp_ports(test_agent_configuration)
 test_agent_configuration = _add_credential_collectors(test_agent_configuration)
 
 CREDENTIALS = (
-    Credentials(Username("Administrator"), None),
-    Credentials(Username("m0nk3y"), None),
-    Credentials(Username("user"), None),
-    Credentials(None, Password("Ivrrw5zEzs")),
-    Credentials(None, Password("Password1!")),
+    Credentials(identity=Username("Administrator"), secret=None),
+    Credentials(identity=Username("m0nk3y"), secret=None),
+    Credentials(identity=Username("user"), secret=None),
+    Credentials(identity=None, secret=Password("Ivrrw5zEzs")),
+    Credentials(identity=None, secret=Password("Password1!")),
 )
 
 wmi_mimikatz_test_configuration = dataclasses.replace(noop_test_configuration)