diff --git a/eden/mononoke/apiserver/src/middleware/core_context.rs b/eden/mononoke/apiserver/src/middleware/core_context.rs
index 95d748c8c0..d1959a16ae 100644
--- a/eden/mononoke/apiserver/src/middleware/core_context.rs
+++ b/eden/mononoke/apiserver/src/middleware/core_context.rs
@@ -17,7 +17,7 @@ use anyhow::{format_err, Error};
 use context::{CoreContext, SessionContainer};
 use fbinit::FacebookInit;
 use identity::Identity;
-use json_encoded::get_identities;
+use identity_ext::json::get_identities;
 use openssl::x509::X509;
 use percent_encoding::percent_decode;
 use scuba_ext::ScubaSampleBuilder;
@@ -76,7 +76,7 @@ fn extract_client_identities(cert: &X509, headers: &HeaderMap) -> Result<Vec<Ide
     const PROXY_IDENTITY_DATA: &str = "proxygen";
     const PROXY_IDENTITY_HEADER: &str = "x-fb-validated-client-encoded-identity";
 
-    let cert_identities = x509::identity::get_identities(&cert)?;
+    let cert_identities = identity_ext::x509::get_identities(&cert)?;
 
     let cert_is_trusted_proxy = cert_identities.iter().any(|identity| {
         identity.get_type() == PROXY_IDENTITY_TYPE && identity.get_data() == PROXY_IDENTITY_DATA
diff --git a/eden/mononoke/gotham_ext/src/middleware/client_identity.rs b/eden/mononoke/gotham_ext/src/middleware/client_identity.rs
index a0781e159e..c161d1d1ed 100644
--- a/eden/mononoke/gotham_ext/src/middleware/client_identity.rs
+++ b/eden/mononoke/gotham_ext/src/middleware/client_identity.rs
@@ -9,7 +9,7 @@ use gotham::state::{client_addr, FromState, State};
 use gotham_derive::StateData;
 use hyper::header::HeaderMap;
 use hyper::{Body, Response};
-use json_encoded::get_identities;
+use identity_ext::json::get_identities;
 use lazy_static::lazy_static;
 use percent_encoding::percent_decode;
 use permission_checker::{MononokeIdentity, MononokeIdentitySet};
diff --git a/eden/mononoke/gotham_ext/src/socket_data.rs b/eden/mononoke/gotham_ext/src/socket_data.rs
index 2e2cc618bf..1da1ffc923 100644
--- a/eden/mononoke/gotham_ext/src/socket_data.rs
+++ b/eden/mononoke/gotham_ext/src/socket_data.rs
@@ -10,7 +10,6 @@ use gotham::{socket_data::SocketData, state::State};
 use gotham_derive::StateData;
 use openssl::ssl::SslRef;
 use permission_checker::{MononokeIdentity, MononokeIdentitySet};
-use x509::identity;
 
 pub struct TlsSocketData {
     identities: Option<TlsCertificateIdentities>,
@@ -86,7 +85,7 @@ pub struct TlsCertificateIdentities {
 impl TlsCertificateIdentities {
     pub fn from_ssl(ssl: &SslRef) -> Option<Self> {
         let peer_certificate = ssl.peer_certificate()?;
-        let identities = identity::get_identities(&peer_certificate)
+        let identities = identity_ext::x509::get_identities(&peer_certificate)
             .ok()?
             .into_iter()
             .filter_map(|id| MononokeIdentity::try_from_identity(&id).ok())
diff --git a/eden/mononoke/server/repo_listener/src/connection_acceptor.rs b/eden/mononoke/server/repo_listener/src/connection_acceptor.rs
index ed959e3433..89f7f0f72a 100644
--- a/eden/mononoke/server/repo_listener/src/connection_acceptor.rs
+++ b/eden/mononoke/server/repo_listener/src/connection_acceptor.rs
@@ -176,7 +176,7 @@ fn accept(
                     Some(cert) => {
                         #[cfg(fbcode_build)]
                         {
-                            ::x509::identity::get_identities(&cert).and_then(
+                            ::identity_ext::x509::get_identities(&cert).and_then(
                                 |identities| -> Result<MononokeIdentitySet> {
                                     identities
                                         .into_iter()