diff --git a/tests/command_completion.cpp b/tests/command_completion.cpp
index 49017b0..2fedb78 100644
--- a/tests/command_completion.cpp
+++ b/tests/command_completion.cpp
@@ -21,7 +21,7 @@
     int expectedContextLength;
     SECTION("no prefix")
     {
-        expectedCompletions = {"cd", "copy", "create", "delete", "set", "commit", "get", "ls", "discard", "help", "describe", "move", "dump", "rpc", "exec", "cancel"};
+        expectedCompletions = {"cd", "copy", "create", "delete", "set", "commit", "get", "ls", "discard", "help", "describe", "move", "dump", "prepare", "exec", "cancel"};
         expectedContextLength = 0;
         SECTION("no space") {
             input = "";
diff --git a/tests/datastore_access.cpp b/tests/datastore_access.cpp
index 2fac222..da3bc48 100644
--- a/tests/datastore_access.cpp
+++ b/tests/datastore_access.cpp
@@ -992,7 +992,7 @@
             }
 
             catching<OnExec>([&] {REQUIRE(datastore->executeRpc(rpc, input) == output);});
-            catching<OnExec>([&] {REQUIRE(proxyDatastore.executeRpc() == output);});
+            catching<OnExec>([&] {REQUIRE(proxyDatastore.execute() == output);});
         }
 
         SECTION("non-existing RPC")
diff --git a/tests/interpreter.cpp b/tests/interpreter.cpp
index a88aa48..966855d 100644
--- a/tests/interpreter.cpp
+++ b/tests/interpreter.cpp
@@ -442,12 +442,12 @@
     {
         dataPath_ rpcPath;
         rpcPath.pushFragment({{"example"}, rpcNode_{"launch-nukes"}});
-        rpc_ rpcCmd;
-        rpcCmd.m_path = rpcPath;
+        prepare_ prepareCmd;
+        prepareCmd.m_path = rpcPath;
 
         {
             REQUIRE_CALL(*input_datastore, createItem("/example:launch-nukes"));
-            boost::apply_visitor(Interpreter(parser, proxyDatastore), command_{rpcCmd});
+            boost::apply_visitor(Interpreter(parser, proxyDatastore), command_{prepareCmd});
         }
 
         REQUIRE(parser.currentPath() == rpcPath);
diff --git a/tests/path_completion.cpp b/tests/path_completion.cpp
index 1c0c8f1..0b0d3f8 100644
--- a/tests/path_completion.cpp
+++ b/tests/path_completion.cpp
@@ -336,9 +336,9 @@
         expectedContextLength = 0;
     }
 
-    SECTION("rpc input nodes NOT completed for rpc command")
+    SECTION("rpc input nodes NOT completed for prepare command")
     {
-        input = "rpc example:fire/";
+        input = "prepare example:fire/";
         expectedCompletions = {};
         expectedContextLength = 13;
     }