diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs
index 67bf6f068..b68412e98 100644
--- a/deltachat-ffi/src/lib.rs
+++ b/deltachat-ffi/src/lib.rs
@@ -4442,12 +4442,12 @@ pub unsafe extern "C" fn dc_accounts_get_next_event(
 #[cfg(feature = "jsonrpc")]
 mod jsonrpc {
     use super::*;
-    use deltachat_jsonrpc::api::CommandApi;
+    use deltachat_jsonrpc::api::DeltaChatApiV0;
     use deltachat_jsonrpc::yerpc::{OutReceiver, RpcClient, RpcSession};
 
     pub struct dc_jsonrpc_instance_t {
         receiver: OutReceiver,
-        handle: RpcSession<CommandApi>,
+        handle: RpcSession<DeltaChatApiV0>,
     }
 
     #[no_mangle]
diff --git a/deltachat-jsonrpc/src/lib.rs b/deltachat-jsonrpc/src/lib.rs
index a60fe536a..188ff6004 100644
--- a/deltachat-jsonrpc/src/lib.rs
+++ b/deltachat-jsonrpc/src/lib.rs
@@ -15,7 +15,7 @@ mod tests {
     async fn basic_json_rpc_functionality() -> anyhow::Result<()> {
         let tmp_dir = TempDir::new().unwrap().path().into();
         let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
+        let api = DeltaChatApiV0::new(accounts);
 
         let (sender, mut receiver) = unbounded::<String>();
 
@@ -56,7 +56,7 @@ mod tests {
     async fn test_batch_set_config() -> anyhow::Result<()> {
         let tmp_dir = TempDir::new().unwrap().path().into();
         let accounts = Accounts::new(tmp_dir).await?;
-        let api = CommandApi::new(accounts);
+        let api = DeltaChatApiV0::new(accounts);
 
         let (sender, mut receiver) = unbounded::<String>();
 
diff --git a/deltachat-jsonrpc/src/webserver.rs b/deltachat-jsonrpc/src/webserver.rs
index d1c0ff317..d8b3d065d 100644
--- a/deltachat-jsonrpc/src/webserver.rs
+++ b/deltachat-jsonrpc/src/webserver.rs
@@ -40,7 +40,7 @@ async fn main() -> Result<(), std::io::Error> {
     Ok(())
 }
 
-async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<CommandApi>) -> Response {
+async fn handler(ws: WebSocketUpgrade, Extension(api): Extension<DeltaChatApiV0>) -> Response {
     let (client, out_receiver) = RpcClient::new();
     let session = RpcSession::new(client.clone(), api.clone());
     tokio::spawn(async move {