openpgp: Rename signature::Builder to signature::SignatureBuilder.

  - Rename all calls to `Builder` with `SignatureBuilder`.

  - Fixes #481.

16 files changed, 115 insertions, 115 deletions

diff --git a/openpgp/src/cert/amalgamation/key.rs b/openpgp/src/cert/amalgamation/key.rs
index 905b6d21..51919f7e 100644
--- a/openpgp/src/cert/amalgamation/key.rs
+++ b/openpgp/src/cert/amalgamation/key.rs
@@ -1321,7 +1321,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2>
                 .unwrap_or_else(|_| self.binding_signature())
                 .clone();
 
-            let mut builder = signature::Builder::from(template)
+            let mut builder = signature::SignatureBuilder::from(template)
                 .set_type(SignatureType::DirectKey);
             builder.remove_all(
                 signature::subpacket::SubpacketTag::PrimaryUserID);
@@ -1345,7 +1345,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2>
                 let mut hash = hash_algo.context()?;
                 self.cert().primary.key().hash(&mut hash);
                 userid.hash(&mut hash);
-                sigs.push(signature::Builder::from(binding_signature.clone())
+                sigs.push(signature::SignatureBuilder::from(binding_signature.clone())
                           .set_key_validity_period(expiration)?
                           .set_signature_creation_time(now)?
                           .set_primary_userid(
@@ -1360,7 +1360,7 @@ impl<'a, P, R, R2> ValidKeyAmalgamation<'a, P, R, R2>
             let mut hash = hash_algo.context()?;
             self.cert().primary.key().hash(&mut hash);
             self.key().hash(&mut hash);
-            sigs.push(signature::Builder::from(self.binding_signature().clone())
+            sigs.push(signature::SignatureBuilder::from(self.binding_signature().clone())
                       .set_key_validity_period(expiration)?
                       .set_signature_creation_time(now)?
                       .sign_hash(primary_signer, hash)?.into());
diff --git a/openpgp/src/cert/bindings.rs b/openpgp/src/cert/bindings.rs
index 8004188f..2d489344 100644
--- a/openpgp/src/cert/bindings.rs
+++ b/openpgp/src/cert/bindings.rs
@@ -47,7 +47,7 @@ impl<P: key::KeyParts> Key<P, key::SubordinateRole> {
     /// let subkey: Key<_, key::SubordinateRole> =
     ///     Key4::generate_ecc(false, Curve::Cv25519)?
     ///     .into();
-    /// let builder = signature::Builder::new(SignatureType::SubkeyBinding)
+    /// let builder = signature::SignatureBuilder::new(SignatureType::SubkeyBinding)
     ///     .set_key_flags(&flags)?;
     /// let binding = subkey.bind(&mut keypair, &cert, builder)?;
     ///
@@ -61,7 +61,7 @@ impl<P: key::KeyParts> Key<P, key::SubordinateRole> {
     ///            1);
     /// # Ok(()) }
     pub fn bind(&self, signer: &mut dyn Signer, cert: &Cert,
-                signature: signature::Builder)
+                signature: signature::SignatureBuilder)
         -> Result<Signature>
     {
         signature
@@ -103,7 +103,7 @@ impl UserID {
     /// // Generate a userid and a binding signature.
     /// let userid = UserID::from("test@example.org");
     /// let builder =
-    ///     signature::Builder::new(SignatureType::PositiveCertification);
+    ///     signature::SignatureBuilder::new(SignatureType::PositiveCertification);
     /// let binding = userid.bind(&mut keypair, &cert, builder)?;
     ///
     /// // Now merge the userid and binding signature into the Cert.
@@ -113,7 +113,7 @@ impl UserID {
     /// assert_eq!(cert.userids().len(), 1);
     /// # Ok(()) }
     pub fn bind(&self, signer: &mut dyn Signer, cert: &Cert,
-                signature: signature::Builder)
+                signature: signature::SignatureBuilder)
                 -> Result<Signature>
     {
         signature
@@ -194,7 +194,7 @@ impl UserID {
                 format!("Invalid signature type: {}", t)).into()),
             None => SignatureType::GenericCertification,
         };
-        let mut sig = signature::Builder::new(typ);
+        let mut sig = signature::SignatureBuilder::new(typ);
         if let Some(algo) = hash_algo.into() {
             sig = sig.set_hash_algo(algo);
         }
@@ -241,7 +241,7 @@ impl UserAttribute {
     ///         Image::Private(100, vec![0, 1, 2].into_boxed_slice())),
     /// ])?;
     /// let builder =
-    ///     signature::Builder::new(SignatureType::PositiveCertification);
+    ///     signature::SignatureBuilder::new(SignatureType::PositiveCertification);
     /// let binding = user_attr.bind(&mut keypair, &cert, builder)?;
     ///
     /// // Now merge the user attribute and binding signature into the Cert.
@@ -251,7 +251,7 @@ impl UserAttribute {
     /// assert_eq!(cert.user_attributes().count(), 1);
     /// # Ok(()) }
     pub fn bind(&self, signer: &mut dyn Signer, cert: &Cert,
-                signature: signature::Builder)
+                signature: signature::SignatureBuilder)
         -> Result<Signature>
     {
         signature
@@ -337,7 +337,7 @@ impl UserAttribute {
                 format!("Invalid signature type: {}", t)).into()),
             None => SignatureType::GenericCertification,
         };
-        let mut sig = signature::Builder::new(typ);
+        let mut sig = signature::SignatureBuilder::new(typ);
         if let Some(algo) = hash_algo.into() {
             sig = sig.set_hash_algo(algo);
         }
diff --git a/openpgp/src/cert/builder.rs b/openpgp/src/cert/builder.rs
index 47ec00b6..d7ce99ef 100644
--- a/openpgp/src/cert/builder.rs
+++ b/openpgp/src/cert/builder.rs
@@ -319,7 +319,7 @@ impl CertBuilder {
         }));
         packets.push(sig.clone().into());
 
-        let sig = signature::Builder::from(sig.clone());
+        let sig = signature::SignatureBuilder::from(sig.clone());
 
         // Remove subpackets that needn't be copied into the binding
         // signatures.
@@ -357,7 +357,7 @@ impl CertBuilder {
             subkey.set_creation_time(creation_time)?;
 
             let mut builder =
-                signature::Builder::new(SignatureType::SubkeyBinding)
+                signature::SignatureBuilder::new(SignatureType::SubkeyBinding)
                 .set_signature_creation_time(creation_time)?
                 // GnuPG wants at least a 512-bit hash for P521 keys.
                 .set_hash_algo(HashAlgorithm::SHA512)
@@ -382,7 +382,7 @@ impl CertBuilder {
                 // We need to create a primary key binding signature.
                 let mut subkey_signer = subkey.clone().into_keypair().unwrap();
                 let backsig =
-                    signature::Builder::new(SignatureType::PrimaryKeyBinding)
+                    signature::SignatureBuilder::new(SignatureType::PrimaryKeyBinding)
                     .set_signature_creation_time(creation_time)?
                     // GnuPG wants at least a 512-bit hash for P521 keys.
                     .set_hash_algo(HashAlgorithm::SHA512)
@@ -424,7 +424,7 @@ impl CertBuilder {
             .unwrap_or(self.ciphersuite)
             .generate_key(&KeyFlags::default().set_certification(true))?;
         key.set_creation_time(creation_time)?;
-        let mut sig = signature::Builder::new(SignatureType::DirectKey)
+        let mut sig = signature::SignatureBuilder::new(SignatureType::DirectKey)
             // GnuPG wants at least a 512-bit hash for P521 keys.
             .set_hash_algo(HashAlgorithm::SHA512)
             .set_features(&Features::sequoia())?
@@ -757,7 +757,7 @@ mod tests {
         let mut primary_signer =
             cert.primary_key().key().clone().parts_into_secret()?
             .into_keypair()?;
-        let sig = signature::Builder::new(SignatureType::DirectKey)
+        let sig = signature::SignatureBuilder::new(SignatureType::DirectKey)
             .set_signature_creation_time(then)?
             .sign_hash(&mut primary_signer, hash)?;
         let cert = cert.merge_packets(vec![sig.into()])?;
diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs
index a2a3d49a..661d34fb 100644
--- a/openpgp/src/cert/mod.rs
+++ b/openpgp/src/cert/mod.rs
@@ -2663,7 +2663,7 @@ mod test {
         key.set_creation_time(t1).unwrap();
         let mut pair = key.clone().into_keypair().unwrap();
         let (bind1, rev1, bind2, rev2) = {
-            let bind1 = signature::Builder::new(SignatureType::DirectKey)
+            let bind1 = signature::SignatureBuilder::new(SignatureType::DirectKey)
                 .set_features(&Features::sequoia()).unwrap()
                 .set_key_flags(&KeyFlags::default()).unwrap()
                 .set_signature_creation_time(t1).unwrap()
@@ -2673,7 +2673,7 @@ mod test {
                 .set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]).unwrap()
                 .sign_direct_key(&mut pair).unwrap();
 
-            let rev1 = signature::Builder::new(SignatureType::KeyRevocation)
+            let rev1 = signature::SignatureBuilder::new(SignatureType::KeyRevocation)
                 .set_signature_creation_time(t2).unwrap()
                 .set_reason_for_revocation(ReasonForRevocation::KeySuperseded,
                                            &b""[..]).unwrap()
@@ -2681,7 +2681,7 @@ mod test {
                 .set_issuer(key.keyid()).unwrap()
                 .sign_direct_key(&mut pair).unwrap();
 
-            let bind2 = signature::Builder::new(SignatureType::DirectKey)
+            let bind2 = signature::SignatureBuilder::new(SignatureType::DirectKey)
                 .set_features(&Features::sequoia()).unwrap()
                 .set_key_flags(&KeyFlags::default()).unwrap()
                 .set_signature_creation_time(t3).unwrap()
@@ -2691,7 +2691,7 @@ mod test {
                 .set_preferred_hash_algorithms(vec![HashAlgorithm::SHA512]).unwrap()
                 .sign_direct_key(&mut pair).unwrap();
 
-            let rev2 = signature::Builder::new(SignatureType::KeyRevocation)
+            let rev2 = signature::SignatureBuilder::new(SignatureType::KeyRevocation)
                 .set_signature_creation_time(t4).unwrap()
                 .set_reason_for_revocation(ReasonForRevocation::KeyCompromised,
                                            &b""[..]).unwrap()
@@ -3348,7 +3348,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g=
         const N: usize = 5;
         for (t, offset) in &[ (t2, 0), (t4, 0), (t3, 1 * N), (t1, 3 * N) ] {
             for i in 0..N {
-                let binding = signature::Builder::new(SignatureType::DirectKey)
+                let binding = signature::SignatureBuilder::new(SignatureType::DirectKey)
                     .set_features(&Features::sequoia()).unwrap()
                     .set_key_flags(&KeyFlags::default()).unwrap()
                     .set_signature_creation_time(t1).unwrap()
@@ -3416,7 +3416,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g=
             assert_eq!(bob_userid_binding.userid().value(), b"bob@bar.com");
 
             let sig_template
-                = signature::Builder::new(SignatureType::GenericCertification)
+                = signature::SignatureBuilder::new(SignatureType::GenericCertification)
                       .set_trust_signature(255, 120)
                       .unwrap();
 
@@ -3537,7 +3537,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g=
         let mut fake_key = packet::Unknown::new(
             packet::Tag::PublicSubkey, anyhow::anyhow!("fake key"));
         fake_key.set_body("fake key".into());
-        let fake_binding = signature::Builder::new(SignatureType::SubkeyBinding)
+        let fake_binding = signature::SignatureBuilder::new(SignatureType::SubkeyBinding)
             .set_issuer(primary_pair.public().keyid())?
             .set_issuer_fingerprint(primary_pair.public().fingerprint())?
             .sign_standalone(&mut primary_pair)?;
@@ -3621,7 +3621,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g=
         let subkey_sec: Key<_, key::SubordinateRole> =
             key::Key4::generate_ecc(false, Curve::Cv25519)?.into();
         let subkey_pub = subkey_sec.clone().take_secret().0;
-        let builder = signature::Builder::new(SignatureType::SubkeyBinding)
+        let builder = signature::SignatureBuilder::new(SignatureType::SubkeyBinding)
             .set_key_flags(&KeyFlags::default()
                            .set_transport_encryption(true))?;
         let binding = subkey_sec.bind(&mut primary_pair, &cert, builder)?;
@@ -3668,7 +3668,7 @@ Pu1xwz57O4zo1VYf6TqHJzVC3OMvMUM2hhdecMUe5x6GorNaj6g=
         let uid: UserID = "foo@example.org".into();
         let sig = uid.bind(
             &mut primary_pair, &cert,
-            signature::Builder::new(SignatureType::PositiveCertification))?;
+            signature::SignatureBuilder::new(SignatureType::PositiveCertification))?;
         let cert = cert.merge_packets(vec![
             uid.into(),
             sig.into(),
diff --git a/openpgp/src/cert/revoke.rs b/openpgp/src/cert/revoke.rs
index f5e3a627..fb702293 100644
--- a/openpgp/src/cert/revoke.rs
+++ b/openpgp/src/cert/revoke.rs
@@ -70,7 +70,7 @@ use crate::cert::prelude::*;
 /// # Ok(())
 /// # }
 pub struct CertRevocationBuilder {
-    builder: signature::Builder,
+    builder: signature::SignatureBuilder,
 }
 
 impl CertRevocationBuilder {
@@ -78,7 +78,7 @@ impl CertRevocationBuilder {
     pub fn new() -> Self {
         Self {
             builder:
-                signature::Builder::new(SignatureType::KeyRevocation)
+                signature::SignatureBuilder::new(SignatureType::KeyRevocation)
         }
     }
 
@@ -126,7 +126,7 @@ impl CertRevocationBuilder {
 }
 
 impl Deref for CertRevocationBuilder {
-    type Target = signature::Builder;
+    type Target = signature::SignatureBuilder;
 
     fn deref(&self) -> &Self::Target {
         &self.builder
@@ -194,7 +194,7 @@ impl Deref for CertRevocationBuilder {
 /// # Ok(()) }
 /// ```
 pub struct SubkeyRevocationBuilder {
-    builder: signature::Builder,
+    builder: signature::SignatureBuilder,
 }
 
 impl SubkeyRevocationBuilder {
@@ -202,7 +202,7 @@ impl SubkeyRevocationBuilder {
     pub fn new() -> Self {
         Self {
             builder:
-                signature::Builder::new(SignatureType::SubkeyRevocation)
+                signature::SignatureBuilder::new(SignatureType::SubkeyRevocation)
         }
     }
 
@@ -244,7 +244,7 @@ impl SubkeyRevocationBuilder {
 }
 
 impl Deref for SubkeyRevocationBuilder {
-    type Target = signature::Builder;
+    type Target = signature::SignatureBuilder;
 
     fn deref(&self) -> &Self::Target {
         &self.builder
@@ -312,7 +312,7 @@ impl Deref for SubkeyRevocationBuilder {
 /// # Ok(()) }
 /// ```
 pub struct UserIDRevocationBuilder {
-    builder: signature::Builder,
+    builder: signature::SignatureBuilder,
 }
 
 impl UserIDRevocationBuilder {
@@ -320,7 +320,7 @@ impl UserIDRevocationBuilder {
     pub fn new() -> Self {
         Self {
             builder:
-                signature::Builder::new(SignatureType::CertificationRevocation)
+                signature::SignatureBuilder::new(SignatureType::CertificationRevocation)
         }
     }
 
@@ -361,7 +361,7 @@ impl UserIDRevocationBuilder {
 }
 
 impl Deref for UserIDRevocationBuilder {
-    type Target = signature::Builder;
+    type Target = signature::SignatureBuilder;
 
     fn deref(&self) -> &Self::Target {
         &self.builder
@@ -432,7 +432,7 @@ impl Deref for UserIDRevocationBuilder {
 /// # Ok(()) }
 /// ```
 pub struct UserAttributeRevocationBuilder {
-    builder: signature::Builder,
+    builder: signature::SignatureBuilder,
 }
 
 impl UserAttributeRevocationBuilder {
@@ -440,7 +440,7 @@ impl UserAttributeRevocationBuilder {
     pub fn new() -> Self {
         Self {
             builder:
-                signature::Builder::new(SignatureType::CertificationRevocation)
+                signature::SignatureBuilder::new(SignatureType::CertificationRevocation)
         }
     }
 
@@ -481,7 +481,7 @@ impl UserAttributeRevocationBuilder {
 }
 
 impl Deref for UserAttributeRevocationBuilder {
-    type Target = signature::Builder;
+    type Target = signature::SignatureBuilder;
 
     fn deref(&self) -> &Self::Target {
         &self.builder
diff --git a/openpgp/src/crypto/hash.rs b/openpgp/src/crypto/hash.rs
index 433b7506..9605318f 100644
--- a/openpgp/src/crypto/hash.rs
+++ b/openpgp/src/crypto/hash.rs
@@ -322,7 +322,7 @@ impl Hash for Signature4 {
     }
 }
 
-impl Hash for signature::Builder {
+impl Hash for signature::SignatureBuilder {
     /// Adds the `Signature` to the provided hash context.
     fn hash(&self, hash: &mut Context) {
         use crate::serialize::MarshalInto;
@@ -389,7 +389,7 @@ impl Hash for signature::Builder {
 impl Signature {
     /// Computes the message digest of standalone signatures.
     pub fn hash_standalone<'a, S>(sig: S) -> Result<Vec<u8>>
-        where S: Into<&'a signature::Builder>
+        where S: Into<&'a signature::SignatureBuilder>
     {
         let sig = sig.into();
         let mut h = sig.hash_algo().context()?;
@@ -403,7 +403,7 @@ impl Signature {
 
     /// Computes the message digest of timestamp signatures.
     pub fn hash_timestamp<'a, S>(sig: S) -> Result<Vec<u8>>
-        where S: Into<&'a signature::Builder>
+        where S: Into<&'a signature::SignatureBuilder>
     {
         Self::hash_standalone(sig)
     }
@@ -413,7 +413,7 @@ impl Signature {
     pub fn hash_direct_key<'a, P, S>(sig: S, key: &Key<P, key::PrimaryRole>)
         -> Result<Vec<u8>>
         where P: key::KeyParts,
-              S: Into<&'a signature::Builder>,
+              S: Into<&'a signature::SignatureBuilder>,
     {
 
         let sig = sig.into();
@@ -436,7 +436,7 @@ impl Signature {
         -> Result<Vec<u8>>
         where P: key::KeyParts,
               Q: key::KeyParts,
-              S: Into<&'a signature::Builder>
+              S: Into<&'a signature::SignatureBuilder>
     {
 
         let sig = sig.into();
@@ -460,7 +460,7 @@ impl Signature {
         -> Result<Vec<u8>>
         where P: key::KeyParts,
               Q: key::KeyParts,
-              S: Into<&'a signature::Builder>
+              S: Into<&'a signature::SignatureBuilder>
     {
         Self::hash_subkey_binding(sig.into(), key, subkey)
     }
@@ -472,7 +472,7 @@ impl Signature {
                                          userid: &UserID)
         -> Result<Vec<u8>>
         where P: key::KeyParts,
-              S: Into<&'a signature::Builder>
+              S: Into<&'a signature::SignatureBuilder>
     {
         let sig = sig.into();
         let mut h = sig.hash_algo().context()?;
@@ -494,7 +494,7 @@ impl Signature {
         ua: &UserAttribute)
         -> Result<Vec<u8>>
         where P: key::KeyParts,
-              S: Into<&'a signature::Builder>,
+              S: Into<&'a signature::SignatureBuilder>,
     {
 
         let sig = sig.into();
diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs
index 8dd1b197..8ab63553 100644
--- a/openpgp/src/message/mod.rs
+++ b/openpgp/src/message/mod.rs
@@ -842,7 +842,7 @@ mod tests {
             crate::packet::key::Key4::generate_ecc(true, crate::types::Curve::Ed25519)
             .unwrap().into();
         let mut pair = key.clone().into_keypair().unwrap();
-        let sig = crate::packet::signature::Builder::new(SignatureType::Binary)
+        let sig = crate::packet::signature::SignatureBuilder::new(SignatureType::Binary)
             .sign_hash(&mut pair, hash.context().unwrap()).unwrap();
 
         // 0: OnePassSig
@@ -954,7 +954,7 @@ mod tests {
             crate::packet::key::Key4::generate_ecc(true, crate::types::Curve::Ed25519)
             .unwrap().into();
         let mut pair = key.clone().into_keypair().unwrap();
-        let sig = crate::packet::signature::Builder::new(SignatureType::Binary)
+        let sig = crate::packet::signature::SignatureBuilder::new(SignatureType::Binary)
             .sign_hash(&mut pair, hash.context().unwrap()).unwrap();
 
         // 0: Signature
diff --git a/openpgp/src/packet/signature/mod.rs b/openpgp/src/packet/signature/mod.rs
index 66c0065a..d0829a5d 100644
--- a/openpgp/src/packet/signature/mod.rs
+++ b/openpgp/src/packet/signature/mod.rs
@@ -88,7 +88,7 @@ pub mod subpacket;
 // IMPORTANT: If you add fields to this struct, you need to explicitly
 // IMPORTANT: implement PartialEq, Eq, and Hash.
 #[derive(Clone, Hash, PartialEq, Eq)]
-pub struct Builder {
+pub struct SignatureBuilder {
     /// Version of the signature packet. Must be 4.
     version: u8,
     /// Type of signature.
@@ -101,9 +101,9 @@ pub struct Builder {
     subpackets: SubpacketAreas,
 }
 
-impl ArbitraryBounded for Builder {
+impl ArbitraryBounded for SignatureBuilder {
     fn arbitrary_bounded<G: Gen>(g: &mut G, depth: usize) -> Self {
-        Builder {
+        SignatureBuilder {
             // XXX: Make this more interesting once we dig other
             // versions.
             version: 4,
@@ -115,9 +115,9 @@ impl ArbitraryBounded for Builder {
     }
 }
 
-impl_arbitrary_with_bound!(Builder);
+impl_arbitrary_with_bound!(SignatureBuilder);
 
-impl Deref for Builder {
+impl Deref for SignatureBuilder {
     type Target = SubpacketAreas;
 
     fn deref(&self) -> &Self::Target {
@@ -125,16 +125,16 @@ impl Deref for Builder {
     }
 }
 
-impl DerefMut for Builder {
+impl DerefMut for SignatureBuilder {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.subpackets
     }
 }
 
-impl Builder {
-    /// Returns a new `Builder` object.
+impl SignatureBuilder {
+    /// Returns a new `SignatureBuilder` object.
     pub fn new(typ: SignatureType) ->  Self {
-        Builder {
+        SignatureBuilder {
             version: 4,
             typ,
             pk_algo: PublicKeyAlgorithm::Unknown(0),
@@ -383,7 +383,7 @@ impl Builder {
     }
 }
 
-impl From<Signature> for Builder {
+impl From<Signature> for SignatureBuilder {
     fn from(sig: Signature) -> Self {
         match sig {
             Signature::V4(sig) => sig.into(),
@@ -392,13 +392,13 @@ impl From<Signature> for Builder {
     }
 }
 
-impl From<Signature4> for Builder {
+impl From<Signature4> for SignatureBuilder {
     fn from(sig: Signature4) -> Self {
         sig.fields
     }
 }
 
-impl<'a> From<&'a Signature> for &'a Builder {
+impl<'a> From<&'a Signature> for &'a SignatureBuilder {
     fn from(sig: &'a Signature) -> Self {
         match sig {
             Signature::V4(ref sig) => sig.into(),
@@ -407,7 +407,7 @@ impl<'a> From<&'a Signature> for &'a Builder {
     }
 }
 
-impl<'a> From<&'a Signature4> for &'a Builder {
+impl<'a> From<&'a Signature4> for &'a SignatureBuilder {
     fn from(sig: &'a Signature4) -> Self {
         &sig.fields
     }
@@ -428,8 +428,8 @@ pub struct Signature4 {
     /// CTB packet header fields.
     pub(crate) common: packet::Common,
 
-    /// Fields as configured using the builder.
-    pub(crate) fields: Builder,
+    /// Fields as configured using the SignatureBuilder.
+    pub(crate) fields: SignatureBuilder,
 
     /// Lower 16 bits of the signed hash value.
     digest_prefix: [u8; 2],
@@ -515,10 +515,10 @@ impl std::hash::Hash for Signature4 {
 impl Signature4 {
     /// Creates a new signature packet.
     ///
-    /// If you want to sign something, consider using the [`Builder`]
+    /// If you want to sign something, consider using the [`SignatureBuilder`]
     /// interface.
     ///
-    /// [`Builder`]: struct.Builder.html
+    /// [`SignatureBuilder`]: struct.SignatureBuilder.html
     pub fn new(typ: SignatureType, pk_algo: PublicKeyAlgorithm,
                hash_algo: HashAlgorithm, hashed_area: SubpacketArea,
                unhashed_area: SubpacketArea,
@@ -526,7 +526,7 @@ impl Signature4 {
                mpis: mpi::Signature) -> Self {
         Signature4 {
             common: Default::default(),
-            fields: Builder {
+            fields: SignatureBuilder {
                 version: 4,
                 typ,
                 pk_algo,
@@ -1225,7 +1225,7 @@ impl ArbitraryBounded for Signature4 {
         use mpi::MPI;
         use PublicKeyAlgorithm::*;
 
-        let fields = Builder::arbitrary_bounded(g, depth);
+        let fields = SignatureBuilder::arbitrary_