diff --git a/keyserver/addons/rust-node-addon/src/identity_client/compare_users.rs b/keyserver/addons/rust-node-addon/src/identity_client/compare_users.rs
--- a/keyserver/addons/rust-node-addon/src/identity_client/compare_users.rs
+++ b/keyserver/addons/rust-node-addon/src/identity_client/compare_users.rs
@@ -10,11 +10,13 @@
     .identity_auth_token
     .parse()
     .map_err(|_| Error::from_status(Status::GenericFailure))?;
-  let mut identity_client =
-    IdentityServiceClient::with_interceptor(channel, |mut req: Request<()>| {
+  let mut identity_client = IdentityKeyserverServiceClient::with_interceptor(
+    channel,
+    |mut req: Request<()>| {
       req.metadata_mut().insert("authorization", token.clone());
       Ok(req)
-    });
+    },
+  );
   let request = Request::new(CompareUsersRequest { users: users });
 
   match identity_client.compare_users(request).await {
diff --git a/keyserver/addons/rust-node-addon/src/identity_client/delete_user.rs b/keyserver/addons/rust-node-addon/src/identity_client/delete_user.rs
--- a/keyserver/addons/rust-node-addon/src/identity_client/delete_user.rs
+++ b/keyserver/addons/rust-node-addon/src/identity_client/delete_user.rs
@@ -8,11 +8,13 @@
     .identity_auth_token
     .parse()
     .map_err(|_| Error::from_status(Status::GenericFailure))?;
-  let mut identity_client =
-    IdentityServiceClient::with_interceptor(channel, |mut req: Request<()>| {
+  let mut identity_client = IdentityKeyserverServiceClient::with_interceptor(
+    channel,
+    |mut req: Request<()>| {
       req.metadata_mut().insert("authorization", token.clone());
       Ok(req)
-    });
+    },
+  );
 
   let request = Request::new(DeleteUserRequest {
     user_id: user_id.clone(),
diff --git a/keyserver/addons/rust-node-addon/src/identity_client/login_user.rs b/keyserver/addons/rust-node-addon/src/identity_client/login_user.rs
--- a/keyserver/addons/rust-node-addon/src/identity_client/login_user.rs
+++ b/keyserver/addons/rust-node-addon/src/identity_client/login_user.rs
@@ -15,11 +15,13 @@
     .identity_auth_token
     .parse()
     .map_err(|_| Error::from_status(Status::GenericFailure))?;
-  let mut identity_client =
-    IdentityServiceClient::with_interceptor(channel, |mut req: Request<()>| {
+  let mut identity_client = IdentityKeyserverServiceClient::with_interceptor(
+    channel,
+    |mut req: Request<()>| {
       req.metadata_mut().insert("authorization", token.clone());
       Ok(req)
-    });
+    },
+  );
 
   // Create a LoginRequest channel and use ReceiverStream to turn the
   // MPSC receiver into a Stream for outbound messages
@@ -73,11 +75,13 @@
     .identity_auth_token
     .parse()
     .map_err(|_| Error::from_status(Status::GenericFailure))?;
-  let mut identity_client =
-    IdentityServiceClient::with_interceptor(channel, |mut req: Request<()>| {
+  let mut identity_client = IdentityKeyserverServiceClient::with_interceptor(
+    channel,
+    |mut req: Request<()>| {
       req.metadata_mut().insert("authorization", token.clone());
       Ok(req)
-    });
+    },
+  );
 
   // Create a LoginRequest channel and use ReceiverStream to turn the
   // MPSC receiver into a Stream for outbound messages
diff --git a/keyserver/addons/rust-node-addon/src/identity_client/mod.rs b/keyserver/addons/rust-node-addon/src/identity_client/mod.rs
--- a/keyserver/addons/rust-node-addon/src/identity_client/mod.rs
+++ b/keyserver/addons/rust-node-addon/src/identity_client/mod.rs
@@ -3,12 +3,12 @@
 pub mod login_user;
 pub mod register_user;
 pub mod identity {
-  tonic::include_proto!("identity");
+  tonic::include_proto!("identity.keyserver");
 }
 pub mod update_user;
 
 use comm_opaque::Cipher;
-use identity::identity_service_client::IdentityServiceClient;
+use identity::identity_keyserver_service_client::IdentityKeyserverServiceClient;
 use identity::{
   login_request::Data::PakeLoginRequest,
   login_request::Data::WalletLoginRequest,
diff --git a/keyserver/addons/rust-node-addon/src/identity_client/register_user.rs b/keyserver/addons/rust-node-addon/src/identity_client/register_user.rs
--- a/keyserver/addons/rust-node-addon/src/identity_client/register_user.rs
+++ b/keyserver/addons/rust-node-addon/src/identity_client/register_user.rs
@@ -14,11 +14,13 @@
     .identity_auth_token
     .parse()
     .map_err(|_| Error::from_status(Status::GenericFailure))?;
-  let mut identity_client =
-    IdentityServiceClient::with_interceptor(channel, |mut req: Request<()>| {
+  let mut identity_client = IdentityKeyserverServiceClient::with_interceptor(
+    channel,
+    |mut req: Request<()>| {
       req.metadata_mut().insert("authorization", token.clone());
       Ok(req)
-    });
+    },
+  );
 
   // Create a RegistrationRequest channel and use ReceiverStream to turn the
   // MPSC receiver into a Stream for outbound messages
diff --git a/keyserver/addons/rust-node-addon/src/identity_client/update_user.rs b/keyserver/addons/rust-node-addon/src/identity_client/update_user.rs
--- a/keyserver/addons/rust-node-addon/src/identity_client/update_user.rs
+++ b/keyserver/addons/rust-node-addon/src/identity_client/update_user.rs
@@ -1,5 +1,4 @@
 use crate::identity_client::identity as proto;
-use crate::identity_client::identity::identity_service_client::IdentityServiceClient;
 use crate::identity_client::identity::pake_login_response::Data::AccessToken;
 use crate::identity_client::identity::{
   update_user_request, update_user_response, UpdateUserRequest,
@@ -13,6 +12,7 @@
   ClientRegistrationFinishParameters, CredentialFinalization,
   CredentialResponse, RegistrationUpload,
 };
+use proto::identity_keyserver_service_client::IdentityKeyserverServiceClient;
 use rand::{rngs::OsRng, CryptoRng, Rng};
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
@@ -30,7 +30,7 @@
     .identity_auth_token
     .parse()
     .map_err(|_| Error::from_status(Status::GenericFailure))?;
-  let mut identity_client = IdentityServiceClient::with_interceptor(
+  let mut identity_client = IdentityKeyserverServiceClient::with_interceptor(
     channel,
     |mut req: tonic::Request<()>| {
       req.metadata_mut().insert("authorization", token.clone());
diff --git a/native/native_rust_library/src/lib.rs b/native/native_rust_library/src/lib.rs
--- a/native/native_rust_library/src/lib.rs
+++ b/native/native_rust_library/src/lib.rs
@@ -8,14 +8,14 @@
 mod crypto_tools;
 mod identity_client;
 mod identity {
-  tonic::include_proto!("identity");
+  tonic::include_proto!("identity.keyserver");
 }
 mod tunnelbroker {
   tonic::include_proto!("tunnelbroker");
 }
 
 use crypto_tools::generate_device_id;
-use identity::identity_service_client::IdentityServiceClient;
+use identity::identity_keyserver_service_client::IdentityKeyserverServiceClient;
 
 lazy_static! {
   pub static ref RUNTIME: Arc<Runtime> = Arc::new(
@@ -98,13 +98,13 @@
 
 #[derive(Debug)]
 pub struct IdentityClient {
-  identity_client: IdentityServiceClient<Channel>,
+  identity_client: IdentityKeyserverServiceClient<Channel>,
 }
 
 fn initialize_identity_client(addr: String) -> Box<IdentityClient> {
   Box::new(IdentityClient {
     identity_client: RUNTIME
-      .block_on(IdentityServiceClient::connect(addr))
+      .block_on(IdentityKeyserverServiceClient::connect(addr))
       .unwrap(),
   })
 }
diff --git a/services/identity/src/main.rs b/services/identity/src/main.rs
--- a/services/identity/src/main.rs
+++ b/services/identity/src/main.rs
@@ -17,7 +17,7 @@
 use config::load_config;
 use constants::{IDENTITY_SERVICE_SOCKET_ADDR, SECRETS_DIRECTORY};
 use keygen::generate_and_persist_keypair;
-use service::{IdentityServiceServer, MyIdentityService};
+use service::{IdentityKeyserverServiceServer, MyIdentityService};
 
 #[derive(Parser)]
 #[clap(author, version, about, long_about = None)]
@@ -56,7 +56,8 @@
       let aws_config = aws_config::from_env().region("us-east-2").load().await;
       let database_client = DatabaseClient::new(&aws_config);
       let server = MyIdentityService::new(database_client);
-      let svc = IdentityServiceServer::with_interceptor(server, check_auth);
+      let svc =
+        IdentityKeyserverServiceServer::with_interceptor(server, check_auth);
       Server::builder().add_service(svc).serve(addr).await?;
     }
     Commands::PopulateDB => unimplemented!(),
diff --git a/services/identity/src/service.rs b/services/identity/src/service.rs
--- a/services/identity/src/service.rs
+++ b/services/identity/src/service.rs
@@ -21,10 +21,10 @@
 use crate::pake_grpc;
 use crate::token::{AccessTokenData, AuthType};
 
-pub use proto::identity_service_server::IdentityServiceServer;
+pub use proto::identity_keyserver_service_server::IdentityKeyserverServiceServer;
 use proto::{
   get_user_id_request::AuthType as ProtoAuthType,
-  identity_service_server::IdentityService,
+  identity_keyserver_service_server::IdentityKeyserverService,
   login_request::Data::PakeLoginRequest,
   login_request::Data::WalletLoginRequest,
   login_response::Data::PakeLoginResponse,
@@ -51,7 +51,7 @@
 };
 
 mod proto {
-  tonic::include_proto!("identity");
+  tonic::include_proto!("identity.keyserver");
 }
 
 mod login;
@@ -70,7 +70,7 @@
 }
 
 #[tonic::async_trait]
-impl IdentityService for MyIdentityService {
+impl IdentityKeyserverService for MyIdentityService {
   type RegisterUserStream = Pin<
     Box<
       dyn Stream<Item = Result<RegistrationResponse, Status>> + Send + 'static,
diff --git a/shared/protos/identity.proto b/shared/protos/identity.proto
--- a/shared/protos/identity.proto
+++ b/shared/protos/identity.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package identity;
+package identity.keyserver;
 
-service IdentityService {
+service IdentityKeyserverService {
   // Called by user to register with the Identity Service (PAKE only)
   rpc RegisterUser(stream RegistrationRequest) returns (stream
     RegistrationResponse) {}