diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
index eb10eb909fd..b07ed616ebf 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra.hpp
@@ -167,16 +167,16 @@ class GoblinUltra {
         DataType w_r;                  // column 1
         DataType w_o;                  // column 2
         DataType w_4;                  // column 3
-        DataType sorted_accum;         // column 8
-        DataType z_perm;               // column 9
-        DataType z_lookup;             // column 10
-        DataType ecc_op_wire_1;        // column 11
-        DataType ecc_op_wire_2;        // column 12
-        DataType ecc_op_wire_3;        // column 13
-        DataType ecc_op_wire_4;        // column 14
-        DataType calldata;             // column 15
-        DataType calldata_read_counts; // column 16
-        DataType lookup_inverses;      // column 17
+        DataType sorted_accum;         // column 4
+        DataType z_perm;               // column 5
+        DataType z_lookup;             // column 6
+        DataType ecc_op_wire_1;        // column 7
+        DataType ecc_op_wire_2;        // column 8
+        DataType ecc_op_wire_3;        // column 9
+        DataType ecc_op_wire_4;        // column 10
+        DataType calldata;             // column 11
+        DataType calldata_read_counts; // column 12
+        DataType lookup_inverses;      // column 13
 
         DEFINE_POINTER_VIEW(NUM_WITNESS_ENTITIES,
                             &w_l,
@@ -472,6 +472,10 @@ class GoblinUltra {
         }
     };
 
+    /**
+     * @brief A container for the witness commitments.
+     *
+     */
     using WitnessCommitments = WitnessEntities<Commitment, CommitmentHandle>;
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
index 9c1060ead79..68c53a37754 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/goblin_ultra_recursive.hpp
@@ -180,16 +180,16 @@ template <typename BuilderType> class GoblinUltraRecursive_ {
         DataType w_r;                  // column 1
         DataType w_o;                  // column 2
         DataType w_4;                  // column 3
-        DataType sorted_accum;         // column 8
-        DataType z_perm;               // column 9
-        DataType z_lookup;             // column 10
-        DataType ecc_op_wire_1;        // column 11
-        DataType ecc_op_wire_2;        // column 12
-        DataType ecc_op_wire_3;        // column 13
-        DataType ecc_op_wire_4;        // column 14
-        DataType calldata;             // column 15
-        DataType calldata_read_counts; // column 16
-        DataType lookup_inverses;      // column 17
+        DataType sorted_accum;         // column 4
+        DataType z_perm;               // column 5
+        DataType z_lookup;             // column 6
+        DataType ecc_op_wire_1;        // column 7
+        DataType ecc_op_wire_2;        // column 8
+        DataType ecc_op_wire_3;        // column 9
+        DataType ecc_op_wire_4;        // column 10
+        DataType calldata;             // column 11
+        DataType calldata_read_counts; // column 12
+        DataType lookup_inverses;      // column 13
 
         DEFINE_POINTER_VIEW(NUM_WITNESS_ENTITIES,
                             &w_l,
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
index 9603d6f58e6..aa53e1c6b26 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ultra.hpp
@@ -158,9 +158,9 @@ class Ultra {
         DataType w_r;          // column 1
         DataType w_o;          // column 2
         DataType w_4;          // column 3
-        DataType sorted_accum; // column 8
-        DataType z_perm;       // column 9
-        DataType z_lookup;     // column 10
+        DataType sorted_accum; // column 4
+        DataType z_perm;       // column 5
+        DataType z_lookup;     // column 6
 
         DEFINE_POINTER_VIEW(NUM_WITNESS_ENTITIES, &w_l, &w_r, &w_o, &w_4, &sorted_accum, &z_perm, &z_lookup)
 
@@ -375,6 +375,10 @@ class Ultra {
      */
     using ExtendedEdges = ProverUnivariates<MAX_PARTIAL_RELATION_LENGTH>;
 
+    /**
+     * @brief A container for the witness commitments.
+     *
+     */
     using WitnessCommitments = WitnessEntities<Commitment, CommitmentHandle>;
 
     /**
diff --git a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
index aa186f355c0..297f2520556 100644
--- a/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
+++ b/barretenberg/cpp/src/barretenberg/flavor/ultra_recursive.hpp
@@ -143,9 +143,9 @@ template <typename BuilderType> class UltraRecursive_ {
         DataType w_r;          // column 1
         DataType w_o;          // column 2
         DataType w_4;          // column 3
-        DataType sorted_accum; // column 8
-        DataType z_perm;       // column 9
-        DataType z_lookup;     // column 10
+        DataType sorted_accum; // column 4
+        DataType z_perm;       // column 5
+        DataType z_lookup;     // column 6
 
         DEFINE_POINTER_VIEW(NUM_WITNESS_ENTITIES, &w_l, &w_r, &w_o, &w_4, &sorted_accum, &z_perm, &z_lookup, )