1 files changed, 9 insertions, 9 deletions

diff --git a/openpgp/src/cert/component_iter.rs b/openpgp/src/cert/component_iter.rs
index 9cd9cada..879c673c 100644
--- a/openpgp/src/cert/component_iter.rs
+++ b/openpgp/src/cert/component_iter.rs
@@ -6,8 +6,8 @@ use crate::{
     cert::{
         Cert,
         components::{
-            ComponentBinding,
-            ComponentBindingIter,
+            ComponentBundle,
+            ComponentBundleIter,
             Amalgamation,
             ComponentAmalgamation,
             ValidComponentAmalgamation,
@@ -25,7 +25,7 @@ use crate::{
 /// By default, `ComponentIter` returns all components without context.
 pub struct ComponentIter<'a, C> {
     cert: &'a Cert,
-    iter: ComponentBindingIter<'a, C>,
+    iter: ComponentBundleIter<'a, C>,
 }
 
 impl<'a, C> fmt::Debug for ComponentIter<'a, C> {
@@ -46,11 +46,11 @@ impl<'a, C> Iterator for ComponentIter<'a, C> {
 impl<'a, C> ComponentIter<'a, C> {
     /// Returns a new `ComponentIter` instance.
     pub(crate) fn new(cert: &'a Cert,
-                      iter: std::slice::Iter<'a, ComponentBinding<C>>) -> Self
+                      iter: std::slice::Iter<'a, ComponentBundle<C>>) -> Self
         where Self: 'a
     {
         ComponentIter {
-            cert, iter: ComponentBindingIter { iter: Some(iter), },
+            cert, iter: ComponentBundleIter { iter: Some(iter), },
         }
     }
 
@@ -78,7 +78,7 @@ impl<'a, C> ComponentIter<'a, C> {
     /// A component binding is similar to a component amalgamation,
     /// but is not bound to a specific time.  It contains the
     /// component and all relevant signatures.
-    pub fn bindings(self) -> ComponentBindingIter<'a, C> {
+    pub fn bundles(self) -> ComponentBundleIter<'a, C> {
         self.iter
     }
 }
@@ -94,7 +94,7 @@ impl<'a, C> ComponentIter<'a, C> {
 pub struct ValidComponentIter<'a, C> {
     // This is an option to make it easier to create an empty ValidComponentIter.
     cert: &'a Cert,
-    iter: ComponentBindingIter<'a, C>,
+    iter: ComponentBundleIter<'a, C>,
 
     policy: &'a dyn Policy,
     // The time.
@@ -125,7 +125,7 @@ impl<'a, C> Iterator for ValidComponentIter<'a, C>
 
         loop {
             let ca = ComponentAmalgamation::new(self.cert, self.iter.next()?);
-            t!("Considering component: {:?}", ca.binding());
+            t!("Considering component: {:?}", ca.bundle());
 
             let vca
                 = if let Ok(vca) = ca.set_policy(self.policy, self.time) {
@@ -214,7 +214,7 @@ impl<'a, C> ValidComponentIter<'a, C> {
     ///                 true,
     ///         }
     ///     })
-    ///     .map(|ca| ca.binding())
+    ///     .map(|ca| ca.bundle())
     ///     .collect::<Vec<_>>();
     /// #     Ok(())
     /// # }