diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,3 +1,3 @@
-swh.core[db,http] >= 0.0.60
+swh.core[db,http] >= 0.0.65
 swh.model >= 0.0.32
 swh.objstorage >= 0.0.17
diff --git a/swh/storage/api/client.py b/swh/storage/api/client.py
--- a/swh/storage/api/client.py
+++ b/swh/storage/api/client.py
@@ -5,12 +5,12 @@
 
 import warnings
 
-from swh.core.api import SWHRemoteAPI
+from swh.core.api import RPCClient
 
 from ..exc import StorageAPIError
 
 
-class RemoteStorage(SWHRemoteAPI):
+class RemoteStorage(RPCClient):
     """Proxy to a remote storage API"""
     api_exception = StorageAPIError
 
diff --git a/swh/storage/api/server.py b/swh/storage/api/server.py
--- a/swh/storage/api/server.py
+++ b/swh/storage/api/server.py
@@ -11,13 +11,13 @@
 
 from swh.core import config
 from swh.storage import get_storage as get_swhstorage
-from swh.core.api import (SWHServerAPIApp, decode_request,
+from swh.core.api import (RPCServerApp, decode_request,
                           error_handler,
                           encode_data_server as encode_data)
 from swh.core.statsd import statsd
 
 
-app = SWHServerAPIApp(__name__)
+app = RPCServerApp(__name__)
 storage = None