diff --git a/src/proto/codec.rs b/src/proto/codec.rs
index 9a9f88b..825a9ea 100644
--- a/src/proto/codec.rs
+++ b/src/proto/codec.rs
@@ -17,9 +17,9 @@ use std::marker;
 use bytes::BytesMut;
 use tokio_codec;
 
-use super::base_codec::{ValueDecode, ValueDecoder, ValueEncode, ValueEncoder, U32_BYTE_LEN};
 use super::peer::Message;
 use super::server::{ServerRequest, ServerResponse};
+use super::value_codec::{ValueDecode, ValueDecoder, ValueEncode, ValueEncoder, U32_BYTE_LEN};
 
 /// Implements tokio's Encoder trait for types that implement ValueEncode.
 pub struct LengthPrefixedEncoder<T> {
diff --git a/src/proto/mod.rs b/src/proto/mod.rs
index 208a556..86295a4 100644
--- a/src/proto/mod.rs
+++ b/src/proto/mod.rs
@@ -1,4 +1,3 @@
-mod base_codec;
 mod codec;
 mod constants;
 mod handler;
@@ -7,14 +6,15 @@ pub mod peer;
 pub mod server;
 mod stream;
 mod user;
+mod value_codec;
 
-pub use self::base_codec::{
-    Decode, ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
-    ValueEncoder,
-};
 pub use self::codec::*;
 pub use self::handler::*;
 pub use self::packet::*;
 pub use self::server::{ServerRequest, ServerResponse};
 pub use self::stream::*;
 pub use self::user::{User, UserStatus};
+pub use self::value_codec::{
+    Decode, ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
+    ValueEncoder,
+};
diff --git a/src/proto/peer/message.rs b/src/proto/peer/message.rs
index 38a0be4..c26fae2 100644
--- a/src/proto/peer/message.rs
+++ b/src/proto/peer/message.rs
@@ -159,7 +159,7 @@ mod tests {
 
     use bytes::BytesMut;
 
-    use crate::proto::base_codec::tests::roundtrip;
+    use crate::proto::value_codec::tests::roundtrip;
     use crate::proto::{ValueDecodeError, ValueDecoder};
 
     use super::*;
diff --git a/src/proto/server/request.rs b/src/proto/server/request.rs
index 0e613b2..f15832c 100644
--- a/src/proto/server/request.rs
+++ b/src/proto/server/request.rs
@@ -590,7 +590,7 @@ mod tests {
 
     use bytes::BytesMut;
 
-    use crate::proto::base_codec::tests::roundtrip;
+    use crate::proto::value_codec::tests::roundtrip;
     use crate::proto::{ValueDecodeError, ValueDecoder};
 
     use super::*;
diff --git a/src/proto/server/response.rs b/src/proto/server/response.rs
index ec2ec23..8cd1a7d 100644
--- a/src/proto/server/response.rs
+++ b/src/proto/server/response.rs
@@ -1342,7 +1342,7 @@ mod tests {
 
     use bytes::BytesMut;
 
-    use crate::proto::base_codec::tests::roundtrip;
+    use crate::proto::value_codec::tests::roundtrip;
     use crate::proto::{ValueDecodeError, ValueDecoder};
 
     use super::*;
diff --git a/src/proto/base_codec.rs b/src/proto/value_codec.rs
similarity index 99%
rename from src/proto/base_codec.rs
rename to src/proto/value_codec.rs
index 4b1adf7..29cfb8a 100644
--- a/src/proto/base_codec.rs
+++ b/src/proto/value_codec.rs
@@ -1,4 +1,4 @@
-//! This module provides encoding and decoding functionality for basic types.
+//! This module provides encoding and decoding functionality for basic values.
 //!
 //! The protocol is pretty basic, though quirky. Base types are serialized in
 //! the following way: