1 files changed, 10 insertions, 11 deletions

diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs
index 41710f32..f1a5519f 100644
--- a/openpgp/src/cert/mod.rs
+++ b/openpgp/src/cert/mod.rs
@@ -46,7 +46,6 @@ pub mod amalgamation;
 mod builder;
 mod bindings;
 pub mod bundle;
-mod component_iter;
 mod keyiter;
 pub mod key_amalgamation;
 mod parser;
@@ -641,8 +640,8 @@ impl Cert {
     }
 
     /// Returns an iterator over the Cert's userids.
-    pub fn userids(&self) -> ComponentIter<UserID> {
-        ComponentIter::new(self, self.userids.iter())
+    pub fn userids(&self) -> ComponentBundleIter<UserID> {
+        ComponentBundleIter::new(self, self.userids.iter())
     }
 
     /// Returns the amalgamated primary user attribute at `t`, if any.
@@ -656,20 +655,20 @@ impl Cert {
     }
 
     /// Returns an iterator over the Cert's `UserAttributeBundle`s.
-    pub fn user_attributes(&self) -> ComponentIter<UserAttribute> {
-        ComponentIter::new(self, self.user_attributes.iter())
+    pub fn user_attributes(&self) -> ComponentBundleIter<UserAttribute> {
+        ComponentBundleIter::new(self, self.user_attributes.iter())
     }
 
     /// Returns an iterator over the Cert's subkeys.
-    pub(crate) fn subkeys(&self) -> ComponentIter<Key<key::PublicParts,
+    pub(crate) fn subkeys(&self) -> ComponentBundleIter<Key<key::PublicParts,
                                                       key::SubordinateRole>>
     {
-        ComponentIter::new(self, self.subkeys.iter())
+        ComponentBundleIter::new(self, self.subkeys.iter())
     }
 
     /// Returns an iterator over the Cert's unknown components.
-    pub fn unknowns(&self) -> ComponentIter<Unknown> {
-        ComponentIter::new(self, self.unknowns.iter())
+    pub fn unknowns(&self) -> ComponentBundleIter<Unknown> {
+        ComponentBundleIter::new(self, self.unknowns.iter())
     }
 
     /// Returns a slice containing all bad signatures.
@@ -1478,7 +1477,7 @@ impl<'a> ValidCert<'a> {
     }
 
     /// Returns an iterator over the Cert's userids.
-    pub fn userids(&self) -> ValidComponentIter<UserID> {
+    pub fn userids(&self) -> ValidComponentBundleIter<UserID> {
         self.cert.userids().with_policy(self.policy, self.time)
     }
 
@@ -1490,7 +1489,7 @@ impl<'a> ValidCert<'a> {
     }
 
     /// Returns an iterator over the Cert's `UserAttributeBundle`s.
-    pub fn user_attributes(&self) -> ValidComponentIter<UserAttribute> {
+    pub fn user_attributes(&self) -> ValidComponentBundleIter<UserAttribute> {
         self.cert.user_attributes().with_policy(self.policy, self.time)
     }
 }