diff --git a/.changelog/2469.internal.2.md b/.changelog/2469.internal.2.md
new file mode 100644
index 00000000000..e8a3bb16511
--- /dev/null
+++ b/.changelog/2469.internal.2.md
@@ -0,0 +1 @@
+client: Rename the rpc crate to enclave_rpc
diff --git a/client/src/rpc/api/enclaverpc.rs b/client/src/enclave_rpc/api/enclaverpc.rs
similarity index 100%
rename from client/src/rpc/api/enclaverpc.rs
rename to client/src/enclave_rpc/api/enclaverpc.rs
diff --git a/client/src/rpc/api/mod.rs b/client/src/enclave_rpc/api/mod.rs
similarity index 100%
rename from client/src/rpc/api/mod.rs
rename to client/src/enclave_rpc/api/mod.rs
diff --git a/client/src/rpc/client.rs b/client/src/enclave_rpc/client.rs
similarity index 100%
rename from client/src/rpc/client.rs
rename to client/src/enclave_rpc/client.rs
diff --git a/client/src/rpc/macros.rs b/client/src/enclave_rpc/macros.rs
similarity index 100%
rename from client/src/rpc/macros.rs
rename to client/src/enclave_rpc/macros.rs
diff --git a/client/src/rpc/mod.rs b/client/src/enclave_rpc/mod.rs
similarity index 100%
rename from client/src/rpc/mod.rs
rename to client/src/enclave_rpc/mod.rs
diff --git a/client/src/rpc/transport.rs b/client/src/enclave_rpc/transport.rs
similarity index 100%
rename from client/src/rpc/transport.rs
rename to client/src/enclave_rpc/transport.rs
diff --git a/client/src/lib.rs b/client/src/lib.rs
index f6fbbbdf752..b173ecfcb28 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -3,10 +3,9 @@
 #[cfg(not(target_env = "sgx"))]
 #[macro_use]
 pub mod grpc;
+pub mod enclave_rpc;
 #[cfg(not(target_env = "sgx"))]
 pub mod node;
-// TODO: Rename "rpc" module to "enclave_rpc" or similar.
-pub mod rpc;
 #[cfg(not(target_env = "sgx"))]
 pub mod transaction;
 
@@ -14,6 +13,6 @@ pub mod transaction;
 pub type BoxFuture<T> = Box<dyn futures::Future<Item = T, Error = anyhow::Error> + Send>;
 
 // Re-exports.
-pub use self::rpc::RpcClient;
+pub use self::enclave_rpc::RpcClient;
 #[cfg(not(target_env = "sgx"))]
 pub use self::{node::Node, transaction::TxnClient};