diff --git a/aws-lc-rs/src/ed25519.rs b/aws-lc-rs/src/ed25519.rs
index 825ee03139a..db5eff34821 100644
--- a/aws-lc-rs/src/ed25519.rs
+++ b/aws-lc-rs/src/ed25519.rs
@@ -109,7 +109,7 @@ pub struct Ed25519SeedBufferType {
 }
 /// Elliptic curve private key data encoded as a big-endian fixed-length integer.
 #[allow(clippy::module_name_repetitions)]
-pub type Ed25519SeedBuffer<'a> = Buffer<'a, Ed25519SeedBufferType>;
+pub type Ed25519SeedBin<'a> = Buffer<'a, Ed25519SeedBufferType>;
 
 impl Seed<'_> {
     /// Exposes the seed encoded as a big-endian fixed-length integer.
@@ -118,9 +118,9 @@ impl Seed<'_> {
     ///
     /// # Errors
     /// `error::Unspecified` if serialization failed.
-    pub fn to_buffer(&self) -> Result<Ed25519SeedBuffer, Unspecified> {
+    pub fn to_buffer(&self) -> Result<Ed25519SeedBin, Unspecified> {
         let buffer = Vec::from(&self.0.private_key[..ED25519_PRIVATE_KEY_SEED_LEN]);
-        Ok(Ed25519SeedBuffer::new(buffer))
+        Ok(Ed25519SeedBin::new(buffer))
     }
 }
 
diff --git a/aws-lc-rs/src/lib.rs b/aws-lc-rs/src/lib.rs
index 84dde4ba147..5e8317fe508 100644
--- a/aws-lc-rs/src/lib.rs
+++ b/aws-lc-rs/src/lib.rs
@@ -103,7 +103,7 @@ extern crate core;
 
 pub mod aead;
 pub mod agreement;
-pub mod buffer;
+mod buffer;
 pub mod constant_time;
 pub mod digest;
 pub mod error;
diff --git a/aws-lc-rs/src/signature.rs b/aws-lc-rs/src/signature.rs
index 6f754f0c30e..0cfa3b08dc3 100644
--- a/aws-lc-rs/src/signature.rs
+++ b/aws-lc-rs/src/signature.rs
@@ -259,12 +259,6 @@ pub use crate::ed25519::{
     Ed25519KeyPair, EdDSAParameters, Seed as Ed25519Seed, ED25519_PUBLIC_KEY_LEN,
 };
 
-/// A module containing types that indicate the encoding of a `buffer::Buffer`
-pub mod encoding {
-    pub use crate::ec::key_pair::{EcPrivateKeyBin, EcPrivateKeyRfc5915Der};
-    pub use crate::ec::EcPublicKeyX509Der;
-}
-
 /// The longest signature is an ASN.1 P-384 signature where *r* and *s* are of
 /// maximum length with the leading high bit set on each. Then each component
 /// will have a tag, a one-byte length, and a one-byte “I'm not negative”