diff --git a/src/plonk/circuit_builder.rs b/src/plonk/circuit_builder.rs
index 2451b46b..ac6196bf 100644
--- a/src/plonk/circuit_builder.rs
+++ b/src/plonk/circuit_builder.rs
@@ -506,27 +506,27 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     ) -> (Vec<PolynomialValues<F>>, PartitionWitness<F>) {
         let degree = self.gate_instances.len();
         let degree_log = log2_strict(degree);
-        let mut target_partition =
+        let mut partition_witness =
             PartitionWitness::new(self.config.num_wires, self.config.num_routed_wires, degree);
 
         for gate in 0..degree {
             for input in 0..self.config.num_wires {
-                target_partition.add(Target::Wire(Wire { gate, input }));
+                partition_witness.add(Target::Wire(Wire { gate, input }));
             }
         }
 
         for index in 0..self.virtual_target_index {
-            target_partition.add(Target::VirtualTarget { index });
+            partition_witness.add(Target::VirtualTarget { index });
         }
 
         for &CopyConstraint { pair: (a, b), .. } in &self.copy_constraints {
-            target_partition.merge(a, b);
+            partition_witness.merge(a, b);
         }
 
-        let (wire_partition, partition) = target_partition.wire_partition();
+        let wire_partition = partition_witness.wire_partition();
         (
             wire_partition.get_sigma_polys(degree_log, k_is, subgroup),
-            partition,
+            partition_witness,
         )
     }
 
@@ -616,7 +616,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         let constant_vecs = self.constant_polys(&prefixed_gates, num_constants);
 
         let k_is = get_unique_coset_shifts(degree, self.config.num_routed_wires);
-        let (sigma_vecs, partition) = self.sigma_vecs(&k_is, &subgroup);
+        let (sigma_vecs, partition_witness) = self.sigma_vecs(&k_is, &subgroup);
 
         let constants_sigmas_vecs = [constant_vecs, sigma_vecs.clone()].concat();
         let constants_sigmas_commitment = PolynomialBatchCommitment::from_values(
@@ -640,7 +640,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
             gate_instances: self.gate_instances,
             public_inputs: self.public_inputs,
             marked_targets: self.marked_targets,
-            partition_witness: partition,
+            partition_witness,
         };
 
         // The HashSet of gates will have a non-deterministic order. When converting to a Vec, we
diff --git a/src/plonk/permutation_argument.rs b/src/plonk/permutation_argument.rs
index 4fbbf0ec..dbb6bee9 100644
--- a/src/plonk/permutation_argument.rs
+++ b/src/plonk/permutation_argument.rs
@@ -79,7 +79,7 @@ impl<F: Field> PartitionWitness<F> {
     }
 }
 impl<F: Field> PartitionWitness<F> {
-    pub fn wire_partition(mut self) -> (WirePartitions, Self) {
+    pub fn wire_partition(&mut self) -> WirePartition {
         let mut partition = HashMap::<_, Vec<_>>::new();
         for gate in 0..self.degree {
             for input in 0..self.num_routed_wires {
@@ -99,15 +99,15 @@ impl<F: Field> PartitionWitness<F> {
         // Here we keep just the Wire targets, filtering out everything else.
         let partition = partition.into_values().collect::<Vec<_>>();
 
-        (WirePartitions { partition }, self)
+        WirePartition { partition }
     }
 }
 
-pub struct WirePartitions {
+pub struct WirePartition {
     partition: Vec<Vec<Wire>>,
 }
 
-impl WirePartitions {
+impl WirePartition {
     pub(crate) fn get_sigma_polys<F: Field>(
         &self,
         degree_log: usize,
diff --git a/src/plonk/prover.rs b/src/plonk/prover.rs
index f310259c..a7a939bc 100644
--- a/src/plonk/prover.rs
+++ b/src/plonk/prover.rs
@@ -35,7 +35,7 @@ pub(crate) fn prove<F: Extendable<D>, const D: usize>(
     let mut partition_witness = prover_data.partition_witness.clone();
     timed!(
         timing,
-        "fill partition",
+        "fill partition witness",
         for (t, v) in inputs.target_values.into_iter() {
             partition_witness.set_target(t, v);
         }