2 files changed, 12 insertions, 12 deletions

diff --git a/src/transport/plugin_cmd_simple_send.c b/src/transport/plugin_cmd_simple_send.c
index 2a4a8c137..468f4e48a 100644
--- a/src/transport/plugin_cmd_simple_send.c
+++ b/src/transport/plugin_cmd_simple_send.c
@@ -83,7 +83,7 @@ all_peers_started ()
 }
 
 static void
-start_testcase (TESTBED_CMD_HELPER_write_cb write_message, char *router_ip,
+start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                 char *node_ip,
                 char *m,
                 char *n,
diff --git a/src/transport/test_transport_api_cmd_simple_send.c b/src/transport/test_transport_api_cmd_simple_send.c
index 26da53c47..1cc16f307 100644
--- a/src/transport/test_transport_api_cmd_simple_send.c
+++ b/src/transport/test_transport_api_cmd_simple_send.c
@@ -43,19 +43,19 @@ static void
 run (void *cls)
 {
   struct GNUNET_TESTING_Command commands[] = {
-    GNUNET_TESTBED_cmd_netjail_start ("netjail-start-1",
+    GNUNET_TESTING_cmd_netjail_start ("netjail-start-1",
                                       "2",
                                       "1"),
-    GNUNET_TESTBED_cmd_netjail_start_testbed ("netjail-start-testbed-1",
-                                              "2",
-                                              "1",
-                                              "libgnunet_plugin_cmd_simple_send",
-                                              &rv),
-    GNUNET_TESTBED_cmd_stop_testbed ("stop-testbed",
-                                     "netjail-start-testbed-1",
-                                     "2",
-                                     "1"),
-    GNUNET_TESTBED_cmd_netjail_stop ("netjail-stop-1",
+    GNUNET_TESTING_cmd_netjail_start_testing_system ("netjail-start-testbed-1",
+                                                     "2",
+                                                     "1",
+                                                     "libgnunet_plugin_cmd_simple_send",
+                                                     &rv),
+    GNUNET_TESTING_cmd_stop_testing_system ("stop-testbed",
+                                            "netjail-start-testbed-1",
+                                            "2",
+                                            "1"),
+    GNUNET_TESTING_cmd_netjail_stop ("netjail-stop-1",
                                      "2",
                                      "1"),
     GNUNET_TESTING_cmd_end ()