diff --git a/examples/distributed-key-value-store/src/main.rs b/examples/distributed-key-value-store/src/main.rs
index 81bc1c2ec90..b8ecd059fc8 100644
--- a/examples/distributed-key-value-store/src/main.rs
+++ b/examples/distributed-key-value-store/src/main.rs
@@ -23,7 +23,7 @@
 use async_std::io;
 use futures::{prelude::*, select};
 use libp2p::kad;
-use libp2p::kad::record::store::MemoryStore;
+use libp2p::kad::store::MemoryStore;
 use libp2p::kad::Mode;
 use libp2p::{
     mdns, noise,
@@ -148,7 +148,7 @@ fn handle_input_line(kademlia: &mut kad::Behaviour<MemoryStore>, line: String) {
         Some("GET") => {
             let key = {
                 match args.next() {
-                    Some(key) => kad::record::Key::new(&key),
+                    Some(key) => kad::RecordKey::new(&key),
                     None => {
                         eprintln!("Expected key");
                         return;
@@ -160,7 +160,7 @@ fn handle_input_line(kademlia: &mut kad::Behaviour<MemoryStore>, line: String) {
         Some("GET_PROVIDERS") => {
             let key = {
                 match args.next() {
-                    Some(key) => kad::record::Key::new(&key),
+                    Some(key) => kad::RecordKey::new(&key),
                     None => {
                         eprintln!("Expected key");
                         return;
@@ -172,7 +172,7 @@ fn handle_input_line(kademlia: &mut kad::Behaviour<MemoryStore>, line: String) {
         Some("PUT") => {
             let key = {
                 match args.next() {
-                    Some(key) => kad::record::Key::new(&key),
+                    Some(key) => kad::RecordKey::new(&key),
                     None => {
                         eprintln!("Expected key");
                         return;
@@ -201,7 +201,7 @@ fn handle_input_line(kademlia: &mut kad::Behaviour<MemoryStore>, line: String) {
         Some("PUT_PROVIDER") => {
             let key = {
                 match args.next() {
-                    Some(key) => kad::record::Key::new(&key),
+                    Some(key) => kad::RecordKey::new(&key),
                     None => {
                         eprintln!("Expected key");
                         return;
diff --git a/examples/file-sharing/src/network.rs b/examples/file-sharing/src/network.rs
index d6adea0ccd6..9245c2f8217 100644
--- a/examples/file-sharing/src/network.rs
+++ b/examples/file-sharing/src/network.rs
@@ -405,7 +405,7 @@ impl EventLoop {
 #[derive(NetworkBehaviour)]
 struct Behaviour {
     request_response: request_response::cbor::Behaviour<FileRequest, FileResponse>,
-    kademlia: kad::Behaviour<kad::record::store::MemoryStore>,
+    kademlia: kad::Behaviour<kad::store::MemoryStore>,
 }
 
 #[derive(Debug)]
diff --git a/misc/server/src/behaviour.rs b/misc/server/src/behaviour.rs
index 2f7741b9317..ec025e02129 100644
--- a/misc/server/src/behaviour.rs
+++ b/misc/server/src/behaviour.rs
@@ -20,7 +20,7 @@ pub(crate) struct Behaviour {
     relay: relay::Behaviour,
     ping: ping::Behaviour,
     identify: identify::Behaviour,
-    pub(crate) kademlia: Toggle<kad::Behaviour<kad::record::store::MemoryStore>>,
+    pub(crate) kademlia: Toggle<kad::Behaviour<kad::store::MemoryStore>>,
     autonat: Toggle<autonat::Behaviour>,
 }
 
@@ -39,7 +39,7 @@ impl Behaviour {
             kademlia_config.set_provider_record_ttl(Some(Duration::from_secs(0)));
             let mut kademlia = kad::Behaviour::with_config(
                 pub_key.to_peer_id(),
-                kad::record::store::MemoryStore::new(pub_key.to_peer_id()),
+                kad::store::MemoryStore::new(pub_key.to_peer_id()),
                 kademlia_config,
             );
             let bootaddr = Multiaddr::from_str("/dnsaddr/bootstrap.libp2p.io").unwrap();
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
index bfc4eb37e82..79b7c9f71db 100644
--- a/protocols/kad/CHANGELOG.md
+++ b/protocols/kad/CHANGELOG.md
@@ -4,6 +4,8 @@
   See [PR 4659](https://github.com/libp2p/rust-libp2p/pull/4659).
 - Emit `ModeChanged` event whenever we automatically reconfigure the mode.
   See [PR 4503](https://github.com/libp2p/rust-libp2p/pull/4503).
+- Make previously "deprecated" `record` module private.
+  See [PR 4035](https://github.com/libp2p/rust-libp2p/pull/4035).
 
 ## 0.44.6
 
diff --git a/protocols/kad/src/behaviour.rs b/protocols/kad/src/behaviour.rs
index 4a7829d592a..9d19546399d 100644
--- a/protocols/kad/src/behaviour.rs
+++ b/protocols/kad/src/behaviour.rs
@@ -28,7 +28,7 @@ use crate::jobs::*;
 use crate::kbucket::{self, Distance, KBucketsTable, NodeStatus};
 use crate::protocol::{ConnectionType, KadPeer, ProtocolConfig};
 use crate::query::{Query, QueryConfig, QueryId, QueryPool, QueryPoolState};
-use crate::record_priv::{
+use crate::record::{
     self,
     store::{self, RecordStore},
     ProviderRecord, Record,
@@ -148,7 +148,7 @@ pub enum BucketInserts {
 /// This can be used for e.g. signature verification or validating
 /// the accompanying [`Key`].
 ///
-/// [`Key`]: crate::record_priv::Key
+/// [`Key`]: crate::record::Key
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum StoreInserts {
     /// Whenever a (provider) record is received,
@@ -680,7 +680,7 @@ where
     ///
     /// The result of this operation is delivered in a
     /// [`Event::OutboundQueryProgressed{QueryResult::GetRecord}`].
-    pub fn get_record(&mut self, key: record_priv::Key) -> QueryId {
+    pub fn get_record(&mut self, key: record::Key) -> QueryId {
         let record = if let Some(record) = self.store.get(&key) {
             if record.is_expired(Instant::now()) {
                 self.store.remove(&key);
@@ -830,7 +830,7 @@ where
     /// This is a _local_ operation. However, it also has the effect that
     /// the record will no longer be periodically re-published, allowing the
     /// record to eventually expire throughout the DHT.
-    pub fn remove_record(&mut self, key: &record_priv::Key) {
+    pub fn remove_record(&mut self, key: &record::Key) {
         if let Some(r) = self.store.get(key) {
             if r.publisher.as_ref() == Some(self.kbuckets.local_key().preimage()) {
                 self.store.remove(key)
@@ -900,7 +900,7 @@ where
     ///
     /// The results of the (repeated) provider announcements sent by this node are
     /// reported via [`Event::OutboundQueryProgressed{QueryResult::StartProviding}`].
-    pub fn start_providing(&mut self, key: record_priv::Key) -> Result<QueryId, store::Error> {
+    pub fn start_providing(&mut self, key: record::Key) -> Result<QueryId, store::Error> {
         // Note: We store our own provider records locally without local addresses
         // to avoid redundant storage and outdated addresses. Instead these are
         // acquired on demand when returning a `ProviderRecord` for the local node.
@@ -928,7 +928,7 @@ where
     ///
     /// This is a local operation. The local node will still be considered as a
     /// provider for the key by other nodes until these provider records expire.
-    pub fn stop_providing(&mut self, key: &record_priv::Key) {
+    pub fn stop_providing(&mut self, key: &record::Key) {
         self.store
             .remove_provider(key, self.kbuckets.local_key().preimage());
     }
@@ -937,7 +937,7 @@ where
     ///
     /// The result of this operation is delivered in a
     /// reported via [`Event::OutboundQueryProgressed{QueryResult::GetProviders}`].
-    pub fn get_providers(&mut self, key: record_priv::Key) -> QueryId {
+    pub fn get_providers(&mut self, key: record::Key) -> QueryId {
         let providers: HashSet<_> = self
             .store
             .providers(&key)
@@ -1122,7 +1122,7 @@ where
     }
 
     /// Collects all peers who are known to be providers of the value for a given `Multihash`.
-    fn provider_peers(&mut self, key: &record_priv::Key, source: &PeerId) -> Vec<KadPeer> {
+    fn provider_peers(&mut self, key: &record::Key, source: &PeerId) -> Vec<KadPeer> {
         let kbuckets = &mut self.kbuckets;
         let connected = &mut self.connected_peers;
         let listen_addresses = &self.listen_addresses;
@@ -1179,7 +1179,7 @@ where
     }
 
     /// Starts an iterative `ADD_PROVIDER` query for the given key.
-    fn start_add_provider(&mut self, key: record_priv::Key, context: AddProviderContext) {
+    fn start_add_provider(&mut self, key: record::Key, context: AddProviderContext) {
         let info = QueryInfo::AddProvider {
             context,
             key: key.clone(),
@@ -1519,7 +1519,7 @@ where
                         get_closest_peers_stats,
                     },
             } => {
-                let mk_result = |key: record_priv::Key| {
+                let mk_result = |key: record::Key| {
                     if success.len() >= quorum.get() {
                         Ok(PutRecordOk { key })
                     } else {
@@ -1817,7 +1817,7 @@ where
     }
 
     /// Processes a provider record received from a peer.
-    fn provider_received(&mut self, key: record_priv::Key, provider: KadPeer) {
+    fn provider_received(&mut self, key: record::Key, provider: KadPeer) {
         if &provider.node_id != self.kbuckets.local_key().preimage() {
             let record = ProviderRecord {
                 key,
@@ -2792,22 +2792,22 @@ pub enum GetRecordOk {
 pub enum GetRecordError {
     #[error("the record was not found")]
     NotFound {
-        key: record_priv::Key,
+        key: record::Key,
         closest_peers: Vec<PeerId>,
     },
     #[error("the quorum failed; needed {quorum} peers")]
     QuorumFailed {
-        key: record_priv::Key,
+        key: record::Key,
         records: Vec<PeerRecord>,
         quorum: NonZeroUsize,
     },
     #[error("the request timed out")]
-    Timeout { key: record_priv::Key },
+    Timeout { key: record::Key },
 }
 
 impl GetRecordError {
     /// Gets the key of the record for which the operation failed.
-    pub fn key(&self) -> &record_priv::Key {
+    pub fn key(&self) -> &record::Key {
         match self {
             GetRecordError::QuorumFailed { key, .. } => key,
             GetRecordError::Timeout { key, .. } => key,
@@ -2817,7 +2817,7 @@ impl GetRecordError {
 
     /// Extracts the key of the record for which the operation failed,
     /// consuming the error.
-    pub fn into_key(self) -> record_priv::Key {
+    pub fn into_key(self) -> record::Key {
         match self {
             GetRecordError::QuorumFailed { key, .. } => key,
             GetRecordError::Timeout { key, .. } => key,
@@ -2832,7 +2832,7 @@ pub type PutRecordResult = Result<PutRecordOk, PutRecordError>;
 /// The successful result of [`Behaviour::put_record`].
 #[derive(Debug, Clone)]
 pub struct PutRecordOk {
-    pub key: record_priv::Key,
+    pub key: record::Key,
 }
 
 /// The error result of [`Behaviour::put_record`].
@@ -2840,14 +2840,14 @@ pub struct PutRecordOk {
 pub enum PutRecordError {
     #[error("the quorum failed; needed {quorum} peers")]
     QuorumFailed {
-        key: record_priv::Key,
+        key: record::Key,
         /// [`PeerId`]s of the peers the record was successfully stored on.
         success: Vec<PeerId>,
         quorum: NonZeroUsize,
     },
     #[error("the request timed out")]
     Timeout {
-        key: record_priv::Key,
+        key: record::Key,
         /// [`PeerId`]s of the peers the record was successfully stored on.
         success: Vec<PeerId>,
         quorum: NonZeroUsize,
@@ -2856,7 +2856,7 @@ pub enum PutRecordError {
 
 impl PutRecordError {
     /// Gets the key of the record for which the operation failed.
-    pub fn key(&self) -> &record_priv::Key {
+    pub fn key(&self) -> &record::Key {
         match self {
             PutRecordError::QuorumFailed { key, .. } => key,
             PutRecordError::Timeout { key, .. } => key,
@@ -2865,7 +2865,7 @@ impl PutRecordError {
 
     /// Extracts the key of the record for which the operation failed,
     /// consuming the error.
-    pub fn into_key(self) -> record_priv::Key {
+    pub fn into_key(self) -> record::Key {
         match self {
             PutRecordError::QuorumFailed { key, .. } => key,
             PutRecordError::Timeout { key, .. } => key,
@@ -2934,7 +2934,7 @@ pub type GetProvidersResult = Result<GetProvidersOk, GetProvidersError>;
 #[derive(Debug, Clone)]
 pub enum GetProvidersOk {
     FoundProviders {
-        key: record_priv::Key,
+        key: record::Key,
         /// The new set of providers discovered.
         providers: HashSet<PeerId>,
     },
@@ -2948,14 +2948,14 @@ pub enum GetProvidersOk {
 pub enum GetProvidersError {
     #[error("the request timed out")]
     Timeout {
-        key: record_priv::Key,
+        key: record::Key,
         closest_peers: Vec<PeerId>,
     },
 }
 
 impl GetProvidersError {
     /// Gets the key for which the operation failed.
-    pub fn key(&self) -> &record_priv::Key {
+    pub fn key(&self) -> &record::Key {
         match self {
             GetProvidersError::Timeout { key, .. } => key,
         }
@@ -2963,7 +2963,7 @@ impl GetProvidersError {
 
     /// Extracts the key for which the operation failed,
     /// consuming the error.
-    pub fn into_key(self) -> record_priv::Key {
+    pub fn into_key(self) -> record::Key {
         match self {
             GetProvidersError::Timeout { key, .. } => key,
         }
@@ -2976,26 +2976,26 @@ pub type AddProviderResult = Result<AddProviderOk, AddProviderError>;
 /// The successful result of publishing a provider record.
 #[derive(Debug, Clone)]
 pub struct AddProviderOk {
-    pub key: record_priv::Key,
+    pub key: record::Key,
 }
 
 /// The possible errors when publishing a provider record.
 #[derive(Debug, Clone, Error)]
 pub enum AddProviderError {
     #[error("the request timed out")]
-    Timeout { key: record_priv::Key },
+    Timeout { key: record::Key },
 }
 
 impl AddProviderError {
     /// Gets the key for which the operation failed.
-    pub fn key(&self) -> &record_priv::Key {
+    pub fn key(&self) -> &record::Key {
         match self {
             AddProviderError::Timeout { key, .. } => key,
         }
     }
 
     /// Extracts the key for which the operation failed,
-    pub fn into_key(self) -> record_priv::Key {
+    pub fn into_key(self) -> record::Key {
         match self {
             AddProviderError::Timeout { key, .. } => key,
         }
@@ -3094,7 +3094,7 @@ pub enum QueryInfo {
     /// A (repeated) query initiated by [`Behaviour::get_providers`].
     GetProviders {
         /// The key for which to search for providers.
-        key: record_priv::Key,
+        key: record::Key,
         /// The number of providers found so far.
         providers_found: usize,
         /// Current index of events.
@@ -3104,7 +3104,7 @@ pub enum QueryInfo {
     /// A (repeated) query initiated by [`Behaviour::start_providing`].
     AddProvider {
         /// The record key.
-        key: record_priv::Key,
+        key: record::Key,
         /// The current phase of the query.
         phase: AddProviderPhase,
         /// The execution context of the query.
@@ -3125,7 +3125,7 @@ pub enum QueryInfo {
     /// A (repeated) query initiated by [`Behaviour::get_record`].
     GetRecord {
         /// The key to look for.
-        key: record_priv::Key,
+        key: record::Key,
         /// Current index of events.
         step: ProgressStep,
         /// Did we find at least one record?
diff --git a/protocols/kad/src/behaviour/test.rs b/protocols/kad/src/behaviour/test.rs
index 7987e4833f1..f75c59b64b0 100644
--- a/protocols/kad/src/behaviour/test.rs
+++ b/protocols/kad/src/behaviour/test.rs
@@ -23,7 +23,7 @@
 use super::*;
 
 use crate::kbucket::Distance;
-use crate::record_priv::{store::MemoryStore, Key};
+use crate::record::{store::MemoryStore, Key};
 use crate::{K_VALUE, SHA_256_MH};
 use futures::{executor::block_on, future::poll_fn, prelude::*};
 use futures_timer::Delay;
@@ -449,7 +449,7 @@ fn get_record_not_found() {
         .map(|(_addr, swarm)| swarm)
         .collect::<Vec<_>>();
 
-    let target_key = record_priv::Key::from(random_multihash());
+    let target_key = record::Key::from(random_multihash());
     let qid = swarms[0].behaviour_mut().get_record(target_key.clone());
 
     block_on(poll_fn(move |ctx| {
@@ -858,7 +858,7 @@ fn get_record_many() {
 /// network where X is equal to the configured replication factor.
 #[test]
 fn add_provider() {
-    fn prop(keys: Vec<record_priv::Key>, seed: Seed) {
+    fn prop(keys: Vec<record::Key>, seed: Seed) {
         let mut rng = StdRng::from_seed(seed.0);
         let replication_factor =
             NonZeroUsize::new(rng.gen_range(1..(K_VALUE.get() / 2) + 1)).unwrap();
@@ -1372,7 +1372,7 @@ fn network_behaviour_on_address_change() {
 
 #[test]
 fn get_providers_single() {
-    fn prop(key: record_priv::Key) {
+    fn prop(key: record::Key) {
         let (_, mut single_swarm) = build_node();
         single_swarm
             .behaviour_mut()
@@ -1426,7 +1426,7 @@ fn get_providers_single() {
 }
 
 fn get_providers_limit<const N: usize>() {
-    fn prop<const N: usize>(key: record_priv::Key) {
+    fn prop<const N: usize>(key: record::Key) {
         let mut swarms = build_nodes(3);
 
         // Let first peer know of second peer and second peer know of third peer.
diff --git a/protocols/kad/src/handler.rs b/protocols/kad/src/handler.rs
index f994c45a6f5..b8dcf59139a 100644
--- a/protocols/kad/src/handler.rs
+++ b/protocols/kad/src/handler.rs
@@ -22,7 +22,7 @@ use crate::behaviour::Mode;
 use crate::protocol::{
     KadInStreamSink, KadOutStreamSink, KadPeer, KadRequestMsg, KadResponseMsg, ProtocolConfig,
 };
-use crate::record_priv::{self, Record};
+use crate::record::{self, Record};
 use crate::QueryId;
 use either::Either;
 use futures::prelude::*;
@@ -226,7 +226,7 @@ pub enum HandlerEvent {
     /// this key.
     GetProvidersReq {
         /// The key for which providers are requested.
-        key: record_priv::Key,
+        key: record::Key,
         /// Identifier of the request. Needs to be passed back when answering.
         request_id: RequestId,
     },
@@ -252,7 +252,7 @@ pub enum HandlerEvent {
     /// The peer announced itself as a provider of a key.
     AddProvider {
         /// The key for which the peer is a provider of the associated value.
-        key: record_priv::Key,
+        key: record::Key,
         /// The peer that is the provider of the value for `key`.
         provider: KadPeer,
     },
@@ -260,7 +260,7 @@ pub enum HandlerEvent {
     /// Request to get a value from the dht records
     GetRecord {
         /// Key for which we should look in the dht
-        key: record_priv::Key,
+        key: record::Key,
         /// Identifier of the request. Needs to be passed back when answering.
         request_id: RequestId,
     },
@@ -285,7 +285,7 @@ pub enum HandlerEvent {
     /// Response to a request to store a record.
     PutRecordRes {
         /// The key of the stored record.
-        key: record_priv::Key,
+        key: record::Key,
         /// The value of the stored record.
         value: Vec<u8>,
         /// The user data passed to the `PutValue`.
@@ -377,7 +377,7 @@ pub enum HandlerIn {
     /// this key.
     GetProvidersReq {
         /// Identifier being searched.
-        key: record_priv::Key,
+        key: record::Key,
         /// Custom user data. Passed back in the out event when the results arrive.
         query_id: QueryId,
     },
@@ -400,7 +400,7 @@ pub enum HandlerIn {
     /// succeeded.
     AddProvider {
         /// Key for which we should add providers.
-        key: record_priv::Key,
+        key: record::Key,
         /// Known provider for this key.
         provider: KadPeer,
     },
@@ -408,7 +408,7 @@ pub enum HandlerIn {
     /// Request to retrieve a record from the DHT.
     GetRecord {
         /// The key of the record.
-        key: record_priv::Key,
+        key: record::Key,
         /// Custom data. Passed back in the out event when the results arrive.
         query_id: QueryId,
     },
@@ -433,7 +433,7 @@ pub enum HandlerIn {
     /// Response to a `PutRecord`.
     PutRecordRes {
         /// Key of the value that was put.
-        key: record_priv::Key,
+        key: record::Key,
         /// Value that was put.
         value: Vec<u8>,
         /// Identifier of the request that was made by the remote.
diff --git a/protocols/kad/src/jobs.rs b/protocols/kad/src/jobs.rs
index e65dcd40e42..f1631ed6ad1 100644
--- a/protocols/kad/src/jobs.rs
+++ b/protocols/kad/src/jobs.rs
@@ -61,7 +61,7 @@
 //! > to the size of all stored records. As a job runs, the records are moved
 //! > out of the job to the consumer, where they can be dropped after being sent.
 
-use crate::record_priv::{self, store::RecordStore, ProviderRecord, Record};
+use crate::record::{self, store::RecordStore, ProviderRecord, Record};
 use futures::prelude::*;
 use futures_timer::Delay;
 use instant::Instant;
@@ -134,7 +134,7 @@ pub(crate) struct PutRecordJob {
     next_publish: Option<Instant>,
     publish_interval: Option<Duration>,
     record_ttl: Option<Duration>,
-    skipped: HashSet<record_priv::Key>,
+    skipped: HashSet<record::Key>,
     inner: PeriodicJob<vec::IntoIter<Record>>,
 }
 
@@ -166,7 +166,7 @@ impl PutRecordJob {
 
     /// Adds the key of a record that is ignored on the current or
     /// next run of the job.
-    pub(crate) fn skip(&mut self, key: record_priv::Key) {
+    pub(crate) fn skip(&mut self, key: record::Key) {
         self.skipped.insert(key);
     }
 
@@ -336,7 +336,7 @@ impl AddProviderJob {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::record_priv::store::MemoryStore;
+    use crate::record::store::MemoryStore;
     use futures::{executor::block_on, future::poll_fn};
     use quickcheck::*;
     use rand::Rng;
diff --git a/protocols/kad/src/kbucket/key.rs b/protocols/kad/src/kbucket/key.rs
index 15cedaaaa32..93bcce793f0 100644
--- a/protocols/kad/src/kbucket/key.rs
+++ b/protocols/kad/src/kbucket/key.rs
@@ -18,7 +18,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-use crate::record_priv;
+use crate::record;
 use libp2p_core::multihash::Multihash;
 use libp2p_identity::PeerId;
 use sha2::digest::generic_array::{typenum::U32, GenericArray};
@@ -113,8 +113,8 @@ impl From<Vec<u8>> for Key<Vec<u8>> {
     }
 }
 
-impl From<record_priv::Key> for Key<record_priv::Key> {
-    fn from(k: record_priv::Key) -> Self {
+impl From<record::Key> for Key<record::Key> {
+    fn from(k: record::Key) -> Self {
         Key::new(k)
     }
 }
diff --git a/protocols/kad/src/lib.rs b/protocols/kad/src/lib.rs
index 01ec625de5a..d78644913da 100644
--- a/protocols/kad/src/lib.rs
+++ b/protocols/kad/src/lib.rs
@@ -35,14 +35,6 @@
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-mod record_priv;
-#[deprecated(
-    note = "The `record` module will be made private in the future and should not be depended on."
-)]
-pub mod record {
-    pub use super::record_priv::*;
-}
-
 mod addresses;
 mod behaviour;
 mod handler;
@@ -50,6 +42,7 @@ mod jobs;
 mod kbucket;
 mod protocol;
 mod query;
+mod record;
 
 mod proto {
     #![allow(unreachable_pub)]
@@ -77,7 +70,7 @@ pub use kbucket::{
 };
 pub use protocol::ConnectionType;
 pub use query::QueryId;
-pub use record_priv::{store, Key as RecordKey, ProviderRecord, Record};
+pub use record::{store, Key as RecordKey, ProviderRecord, Record};
 
 use libp2p_swarm::StreamProtocol;
 use std::num::NonZeroUsize;
diff --git a/protocols/kad/src/protocol.rs b/protocols/kad/src/protocol.rs
index e6341ee4f21..1cf14745675 100644
--- a/protocols/kad/src/protocol.rs
+++ b/protocols/kad/src/protocol.rs
@@ -27,7 +27,7 @@
 //! is used to send messages to remote peers.
 
 use crate::proto;
-use crate::record_priv::{self, Record};
+use crate::record::{self, Record};
 use asynchronous_codec::{Decoder, Encoder, Framed};
 use bytes::BytesMut;
 use futures::prelude::*;
@@ -260,13 +260,13 @@ pub enum KadRequestMsg {
     /// this key.
     GetProviders {
         /// Identifier being searched.
-        key: record_priv::Key,
+        key: record::Key,
     },
 
     /// Indicates that this list of providers is known for this key.
     AddProvider {
         /// Key for which we should add providers.
-        key: record_priv::Key,
+        key: record::Key,
         /// Known provider for this key.
         provider: KadPeer,
     },
@@ -274,7 +274,7 @@ pub enum KadRequestMsg {
     /// Request to get a value from the dht records.
     GetValue {
         /// The key we are searching for.
-        key: record_priv::Key,
+        key: record::Key,
     },
 
     /// Request to put a value into the dht records.
@@ -312,7 +312,7 @@ pub enum KadResponseMsg {
     /// Response to a `PutValue`.
     PutValue {
         /// The key of the record.
-        key: record_priv::Key,
+        key: record::Key,
         /// Value of the record.
         value: Vec<u8>,
     },
@@ -441,11 +441,11 @@ fn proto_to_req_msg(message: proto::Message) -> Result<KadRequestMsg, io::Error>
             Ok(KadRequestMsg::PutValue { record })
         }
         proto::MessageType::GET_VALUE => Ok(KadRequestMsg::GetValue {
-            key: record_priv::Key::from(message.key),
+            key: record::Key::from(message.key),
         }),
         proto::MessageType::FIND_NODE => Ok(KadRequestMsg::FindNode { key: message.key }),
         proto::MessageType::GET_PROVIDERS => Ok(KadRequestMsg::GetProviders {
-            key: record_priv::Key::from(message.key),
+            key: record::Key::from(message.key),
         }),
         proto::MessageType::ADD_PROVIDER => {
             // TODO: for now we don't parse the peer properly, so it is possible that we get
@@ -457,7 +457,7 @@ fn proto_to_req_msg(message: proto::Message) -> Result<KadRequestMsg, io::Error>
                 .find_map(|peer| KadPeer::try_from(peer).ok());
 
             if let Some(provider) = provider {
-                let key = record_priv::Key::from(message.key);
+                let key = record::Key::from(message.key);
                 Ok(KadRequestMsg::AddProvider { key, provider })
             } else {
                 Err(invalid_data("AddProvider message with no valid peer."))
@@ -521,7 +521,7 @@ fn proto_to_resp_msg(message: proto::Message) -> Result<KadResponseMsg, io::Erro
         }
 
         proto::MessageType::PUT_VALUE => {
-            let key = record_priv::Key::from(message.key);
+            let key = record::Key::from(message.key);
             let rec = message
                 .record
                 .ok_or_else(|| invalid_data("received PutValue message with no record"))?;
@@ -539,7 +539,7 @@ fn proto_to_resp_msg(message: proto::Message) -> Result<KadResponseMsg, io::Erro
 }
 
 fn record_from_proto(record: proto::Record) -> Result<Record, io::Error> {
-    let key = record_priv::Key::from(record.key);
+    let key = record::Key::from(record.key);
     let value = record.value;
 
     let publisher = if !record.publisher.is_empty() {
diff --git a/protocols/kad/src/record_priv.rs b/protocols/kad/src/record.rs
similarity index 100%
rename from protocols/kad/src/record_priv.rs
rename to protocols/kad/src/record.rs
diff --git a/protocols/kad/src/record_priv/store.rs b/protocols/kad/src/record/store.rs
similarity index 100%
rename from protocols/kad/src/record_priv/store.rs
rename to protocols/kad/src/record/store.rs
diff --git a/protocols/kad/src/record_priv/store/memory.rs b/protocols/kad/src/record/store/memory.rs
similarity index 100%
rename from protocols/kad/src/record_priv/store/memory.rs
rename to protocols/kad/src/record/store/memory.rs
diff --git a/swarm/tests/swarm_derive.rs b/swarm/tests/swarm_derive.rs
index 5782d0a92b3..5f6c03451a6 100644
--- a/swarm/tests/swarm_derive.rs
+++ b/swarm/tests/swarm_derive.rs
@@ -98,7 +98,7 @@ fn three_fields() {
     struct Foo {
         ping: ping::Behaviour,
         identify: identify::Behaviour,
-        kad: libp2p_kad::Behaviour<libp2p_kad::record::store::MemoryStore>,
+        kad: libp2p_kad::Behaviour<libp2p_kad::store::MemoryStore>,
     }
 
     #[allow(
@@ -327,7 +327,7 @@ fn with_either() {
     #[derive(NetworkBehaviour)]
     #[behaviour(prelude = "libp2p_swarm::derive_prelude")]
     struct Foo {
-        kad: libp2p_kad::Behaviour<libp2p_kad::record::store::MemoryStore>,
+        kad: libp2p_kad::Behaviour<libp2p_kad::store::MemoryStore>,
         ping_or_identify: Either<ping::Behaviour, identify::Behaviour>,
     }
 
@@ -350,10 +350,7 @@ fn with_generics() {
     #[allow(dead_code)]
     fn foo() {
         require_net_behaviour::<
-            Foo<
-                libp2p_kad::Behaviour<libp2p_kad::record::store::MemoryStore>,
-                libp2p_ping::Behaviour,
-            >,
+            Foo<libp2p_kad::Behaviour<libp2p_kad::store::MemoryStore>, libp2p_ping::Behaviour>,
         >();
     }
 }
@@ -370,8 +367,7 @@ fn with_generics_mixed() {
 
     #[allow(dead_code)]
     fn foo() {
-        require_net_behaviour::<Foo<libp2p_kad::Behaviour<libp2p_kad::record::store::MemoryStore>>>(
-        );
+        require_net_behaviour::<Foo<libp2p_kad::Behaviour<libp2p_kad::store::MemoryStore>>>();
     }
 }
 
@@ -404,7 +400,7 @@ fn custom_event_with_either() {
         prelude = "libp2p_swarm::derive_prelude"
     )]
     struct Foo {
-        kad: libp2p_kad::Behaviour<libp2p_kad::record::store::MemoryStore>,
+        kad: libp2p_kad::Behaviour<libp2p_kad::store::MemoryStore>,
         ping_or_identify: Either<ping::Behaviour, identify::Behaviour>,
     }