diff --git a/src/range_parameters.rs b/src/range_parameters.rs
index 3673f48..f1a745f 100644
--- a/src/range_parameters.rs
+++ b/src/range_parameters.rs
@@ -29,8 +29,12 @@ impl<P> RangeParameters<P>
 where P: FromUniformBytes + Compressable + Clone + Precomputable
 {
     /// Initialize a new 'RangeParameters' with sanity checks
-    pub fn init(bit_length: usize, aggregation_factor: usize, pc_gens: PedersenGens<P>) -> Result<Self, ProofError> {
-        if !aggregation_factor.is_power_of_two() {
+    pub fn init(
+        bit_length: usize,
+        max_aggregation_factor: usize,
+        pc_gens: PedersenGens<P>,
+    ) -> Result<Self, ProofError> {
+        if !max_aggregation_factor.is_power_of_two() {
             return Err(ProofError::InvalidArgument(
                 "Aggregation factor size must be a power of two".to_string(),
             ));
@@ -48,7 +52,7 @@ where P: FromUniformBytes + Compressable + Clone + Precomputable
         }
 
         Ok(Self {
-            bp_gens: BulletproofGens::new(bit_length, aggregation_factor)?,
+            bp_gens: BulletproofGens::new(bit_length, max_aggregation_factor)?,
             pc_gens,
         })
     }
@@ -58,8 +62,8 @@ where P: FromUniformBytes + Compressable + Clone + Precomputable
         &self.pc_gens
     }
 
-    /// Returns the aggregation factor
-    pub fn aggregation_factor(&self) -> usize {
+    /// Returns the maximum aggregation factor
+    pub fn max_aggregation_factor(&self) -> usize {
         self.bp_gens.party_capacity
     }
 
@@ -95,12 +99,12 @@ where P: FromUniformBytes + Compressable + Clone + Precomputable
 
     /// Return the non-public value iterator to the bulletproof generators
     pub fn hi_base_iter(&self) -> impl Iterator<Item = &P> {
-        self.bp_gens.h_iter(self.bit_length(), self.aggregation_factor())
+        self.bp_gens.h_iter(self.bit_length(), self.max_aggregation_factor())
     }
 
     /// Return the non-public mask iterator to the bulletproof generators
     pub fn gi_base_iter(&self) -> impl Iterator<Item = &P> {
-        self.bp_gens.g_iter(self.bit_length(), self.aggregation_factor())
+        self.bp_gens.g_iter(self.bit_length(), self.max_aggregation_factor())
     }
 
     /// Return the interleaved precomputation tables
diff --git a/src/range_proof.rs b/src/range_proof.rs
index 15072d9..dd59e81 100644
--- a/src/range_proof.rs
+++ b/src/range_proof.rs
@@ -334,7 +334,7 @@ where
         let padding = compute_generator_padding(
             statement.generators.bit_length(),
             statement.commitments.len(),
-            statement.generators.aggregation_factor(),
+            statement.generators.max_aggregation_factor(),
         )?;
         let a = statement.generators.precomp().vartime_mixed_multiscalar_mul(
             a_li.iter()
@@ -1034,7 +1034,7 @@ where
         let padding = compute_generator_padding(
             max_statement.generators.bit_length(),
             max_statement.commitments.len(),
-            max_statement.generators.aggregation_factor(),
+            max_statement.generators.max_aggregation_factor(),
         )?;
         if precomp.vartime_mixed_multiscalar_mul(
             gi_base_scalars
diff --git a/src/range_statement.rs b/src/range_statement.rs
index 65faaff..29eb18e 100644
--- a/src/range_statement.rs
+++ b/src/range_statement.rs
@@ -49,7 +49,7 @@ impl<P: Compressable + FromUniformBytes + Clone + Precomputable> RangeStatement<
                 "Incorrect number of minimum value promises".to_string(),
             ));
         }
-        if generators.aggregation_factor() < commitments.len() {
+        if generators.max_aggregation_factor() < commitments.len() {
             return Err(ProofError::InvalidArgument(
                 "Not enough generators for this statement".to_string(),
             ));