diff --git a/zebra-rpc/src/methods.rs b/zebra-rpc/src/methods.rs
index 9507056a737..66c9bd32f11 100644
--- a/zebra-rpc/src/methods.rs
+++ b/zebra-rpc/src/methods.rs
@@ -1540,8 +1540,8 @@ impl Default for GetBlockChainInfo {
 
 /// A wrapper type with a list of transparent address strings.
 ///
-/// This is used for the input parameter of [`Rpc::get_address_balance`],
-/// [`Rpc::get_address_tx_ids`] and [`Rpc::get_address_utxos`].
+/// This is used for the input parameter of [`RpcServer::get_address_balance`],
+/// [`RpcServer::get_address_tx_ids`] and [`RpcServer::get_address_utxos`].
 #[derive(Clone, Debug, Eq, PartialEq, Hash, serde::Deserialize)]
 pub struct AddressStrings {
     /// A list of transparent address strings.
@@ -1698,7 +1698,7 @@ impl Default for SentTransactionHash {
 
 /// Response to a `getblock` RPC request.
 ///
-/// See the notes for the [`Rpc::get_block`] method.
+/// See the notes for the [`RpcServer::get_block`] method.
 #[derive(Clone, Debug, PartialEq, serde::Serialize)]
 #[serde(untagged)]
 #[allow(clippy::large_enum_variant)] //TODO: create a struct for the Object and Box it
@@ -1830,7 +1830,7 @@ pub enum GetBlockTransaction {
 
 /// Response to a `getblockheader` RPC request.
 ///
-/// See the notes for the [`Rpc::get_block_header`] method.
+/// See the notes for the [`RpcServer::get_block_header`] method.
 #[derive(Clone, Debug, PartialEq, serde::Serialize)]
 #[serde(untagged)]
 pub enum GetBlockHeader {
@@ -1844,7 +1844,7 @@ pub enum GetBlockHeader {
 #[derive(Clone, Debug, PartialEq, serde::Serialize)]
 /// Verbose response to a `getblockheader` RPC request.
 ///
-/// See the notes for the [`Rpc::get_block_header`] method.
+/// See the notes for the [`RpcServer::get_block_header`] method.
 pub struct GetBlockHeaderObject {
     /// The hash of the requested block.
     pub hash: GetBlockHash,
@@ -1933,7 +1933,7 @@ impl Default for GetBlockHeaderObject {
 ///
 /// Contains the hex-encoded hash of the requested block.
 ///
-/// Also see the notes for the [`Rpc::get_best_block_hash`] and `get_block_hash` methods.
+/// Also see the notes for the [`RpcServer::get_best_block_hash`] and `get_block_hash` methods.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, serde::Deserialize, serde::Serialize)]
 #[serde(transparent)]
 pub struct GetBlockHash(#[serde(with = "hex")] pub block::Hash);
diff --git a/zebra-rpc/src/methods/get_block_template_rpcs/types/submit_block.rs b/zebra-rpc/src/methods/get_block_template_rpcs/types/submit_block.rs
index 2229cfb3049..cec806901bb 100644
--- a/zebra-rpc/src/methods/get_block_template_rpcs/types/submit_block.rs
+++ b/zebra-rpc/src/methods/get_block_template_rpcs/types/submit_block.rs
@@ -6,7 +6,7 @@ use crate::methods::get_block_template_rpcs::GetBlockTemplate;
 
 /// Optional argument `jsonparametersobject` for `submitblock` RPC request
 ///
-/// See notes for [`GetBlockTemplateRpc::submit_block`] method
+/// See notes for [`crate::methods::GetBlockTemplateRpcServer::submit_block`] method
 #[derive(Clone, Debug, PartialEq, Eq, serde::Deserialize)]
 pub struct JsonParameters {
     /// The workid for the block template. Currently unused.
diff --git a/zebra-rpc/src/server/http_request_compatibility.rs b/zebra-rpc/src/server/http_request_compatibility.rs
index 6eb2e272ba4..5308c5adf53 100644
--- a/zebra-rpc/src/server/http_request_compatibility.rs
+++ b/zebra-rpc/src/server/http_request_compatibility.rs
@@ -20,7 +20,7 @@ use super::cookie::Cookie;
 
 use base64::{engine::general_purpose::URL_SAFE, Engine as _};
 
-/// HTTP [`RequestMiddleware`] with compatibility workarounds.
+/// HTTP [`HttpRequestMiddleware`] with compatibility workarounds.
 ///
 /// This middleware makes the following changes to HTTP requests:
 ///
@@ -34,7 +34,7 @@ use base64::{engine::general_purpose::URL_SAFE, Engine as _};
 /// ### Add missing `content-type` HTTP header
 ///
 /// Some RPC clients don't include a `content-type` HTTP header.
-/// But unlike web browsers, [`jsonrpc_http_server`] does not do content sniffing.
+/// But unlike web browsers, [`jsonrpsee`] does not do content sniffing.
 ///
 /// If there is no `content-type` header, we assume the content is JSON,
 /// and let the parser error if we are incorrect.
diff --git a/zebra-rpc/src/server/rpc_call_compatibility.rs b/zebra-rpc/src/server/rpc_call_compatibility.rs
index 498cfd25b39..2bd22b72924 100644
--- a/zebra-rpc/src/server/rpc_call_compatibility.rs
+++ b/zebra-rpc/src/server/rpc_call_compatibility.rs
@@ -9,17 +9,17 @@ use jsonrpsee::{
 };
 use jsonrpsee_types::ErrorObject;
 
-/// JSON-RPC [`Middleware`] with compatibility workarounds.
+/// JSON-RPC [`FixRpcResponseMiddleware`] with compatibility workarounds.
 ///
 /// This middleware makes the following changes to JSON-RPC calls:
 ///
 /// ## Make RPC framework response codes match `zcashd`
 ///
-/// [`jsonrpc_core`] returns specific error codes while parsing requests:
+/// [`jsonrpsee_types`] returns specific error codes while parsing requests:
 /// <https://docs.rs/jsonrpsee-types/latest/jsonrpsee_types/error/enum.ErrorCode.html>
 ///
 /// But these codes are different from `zcashd`, and some RPC clients rely on the exact code.
-/// Specifically, the [`INVALID_PARAMETERS_ERROR_CODE`] is different:
+/// Specifically, the [`jsonrpsee_types::error::INVALID_PARAMS_CODE`] is different:
 /// <https://docs.rs/jsonrpsee-types/latest/jsonrpsee_types/error/constant.INVALID_PARAMS_CODE.html>
 pub struct FixRpcResponseMiddleware {
     service: RpcService,