diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
index f6d4580fadf9..69425fcd971f 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/benchmark/relations_bench/barycentric.bench.cpp
@@ -9,9 +9,8 @@ auto& engine = numeric::random::get_debug_engine();
 }
 
 using FF = barretenberg::fr;
-using barretenberg::Univariate;
 using barretenberg::BarycentricData;
-
+using barretenberg::Univariate;
 
 namespace proof_system::benchmark {
 
@@ -19,8 +18,7 @@ void extend_2_to_6(State& state) noexcept
 {
     auto univariate = Univariate<FF, 2>::get_random();
     BarycentricData<FF, 2, 6> barycentric_2_to_6;
-    for (auto _ : state)
-    {
+    for (auto _ : state) {
         DoNotOptimize(barycentric_2_to_6.extend(univariate));
     }
 }
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
index 56568cbbf114..bccb233a4f9e 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/standard_composer.test.cpp
@@ -5,13 +5,13 @@
 
 #include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/honk/proof_system/prover.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_round.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 
 using namespace proof_system::honk;
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
index 777242c05f20..ec3196186efe 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/composer/ultra_composer.test.cpp
@@ -8,13 +8,13 @@
 #include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/honk/proof_system/prover.hpp"
 #include "barretenberg/honk/proof_system/ultra_prover.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_round.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
 #include "barretenberg/proof_system/plookup_tables/types.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 
 using namespace proof_system::honk;
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
index 894fe54304d3..37049f218665 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/goblin_ultra.hpp
@@ -1,5 +1,9 @@
 #pragma once
 #include "barretenberg/honk/pcs/kzg/kzg.hpp"
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/univariate.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/ecc_op_queue_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
@@ -7,10 +11,6 @@
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 
 namespace proof_system::honk::flavor {
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
index c0a4a53776e5..55006bdfaa90 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard.hpp
@@ -1,8 +1,6 @@
 #pragma once
 #include "barretenberg/ecc/curves/bn254/g1.hpp"
 #include "barretenberg/honk/pcs/kzg/kzg.hpp"
-#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
@@ -10,6 +8,8 @@
 #include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"
+#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/srs/factories/crs_factory.hpp"
 
 namespace proof_system::honk::flavor {
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
index 957c52aceb4f..dbb013241b0a 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/standard_grumpkin.hpp
@@ -4,13 +4,13 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
-#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
-#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "barretenberg/proof_system/circuit_builder/standard_circuit_builder.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"
+#include "barretenberg/proof_system/relations/arithmetic_relation.hpp"
+#include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include <array>
 #include <concepts>
 #include <span>
@@ -226,8 +226,8 @@ class StandardGrumpkin {
      * @todo TODO(#390): Simplify this by moving MAX_RELATION_LENGTH?
      */
     template <size_t MAX_RELATION_LENGTH>
-    using ExtendedEdges =
-        AllEntities<barretenberg::Univariate<FF, MAX_RELATION_LENGTH>, barretenberg::Univariate<FF, MAX_RELATION_LENGTH>>;
+    using ExtendedEdges = AllEntities<barretenberg::Univariate<FF, MAX_RELATION_LENGTH>,
+                                      barretenberg::Univariate<FF, MAX_RELATION_LENGTH>>;
 
     /**
      * @brief A container for the polynomials evaluations produced during sumcheck, which are purported to be the
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
index 1323ed988743..df21ba0ce55c 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra.hpp
@@ -4,17 +4,17 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 
 namespace proof_system::honk::flavor {
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
index 260b2f44b76f..609421f74c67 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_grumpkin.hpp
@@ -5,17 +5,17 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include <array>
 #include <concepts>
 #include <span>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
index e050d7b6597d..9d98f4a1c256 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/flavor/ultra_recursive.hpp
@@ -5,17 +5,17 @@
 #include "barretenberg/polynomials/barycentric.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
 
+#include "barretenberg/honk/transcript/transcript.hpp"
+#include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/polynomial.hpp"
+#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
+#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/proof_system/relations/auxiliary_relation.hpp"
 #include "barretenberg/proof_system/relations/elliptic_relation.hpp"
 #include "barretenberg/proof_system/relations/gen_perm_sort_relation.hpp"
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
-#include "barretenberg/honk/transcript/transcript.hpp"
-#include "barretenberg/polynomials/evaluation_domain.hpp"
-#include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/proof_system/circuit_builder/ultra_circuit_builder.hpp"
-#include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "barretenberg/srs/factories/crs_factory.hpp"
 #include <array>
 #include <concepts>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
index 53405a3aede8..acb530965c64 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/grand_product_library.hpp
@@ -1,8 +1,8 @@
 #pragma once
+#include "barretenberg/common/constexpr_utils.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/proving_key.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
-#include "barretenberg/common/constexpr_utils.hpp"
 #include <typeinfo>
 
 namespace proof_system::honk::grand_product_library {
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
index af679985ff35..c43a5e699264 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/prover_library.test.cpp
@@ -1,11 +1,11 @@
 
-#include "prover_library.hpp"
 #include "barretenberg/ecc/curves/bn254/bn254.hpp"
 #include "barretenberg/honk/flavor/standard.hpp"
 #include "barretenberg/honk/flavor/ultra.hpp"
 #include "barretenberg/honk/proof_system/grand_product_library.hpp"
 #include "barretenberg/polynomials/polynomial.hpp"
 #include "prover.hpp"
+#include "prover_library.hpp"
 
 #include "barretenberg/srs/factories/file_crs_factory.hpp"
 #include <array>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
index 5f4a5460a3f9..9aeea1327fc9 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/proof_system/ultra_prover.hpp
@@ -5,10 +5,10 @@
 #include "barretenberg/honk/pcs/gemini/gemini.hpp"
 #include "barretenberg/honk/pcs/shplonk/shplonk.hpp"
 #include "barretenberg/honk/proof_system/work_queue.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 
 namespace proof_system::honk {
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
index 884bc3e31c48..ea98cc35c461 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/relation_correctness.test.cpp
@@ -271,8 +271,7 @@ TEST_F(RelationCorrectnessTests, StandardRelationCorrectness)
     grand_product_library::compute_grand_products<honk::flavor::Standard>(prover.key, prover_polynomials, params);
 
     // Construct the round for applying sumcheck relations and results for storing computed results
-    auto relations =
-        std::tuple(proof_system::ArithmeticRelation<FF>(), proof_system::PermutationRelation<FF>());
+    auto relations = std::tuple(proof_system::ArithmeticRelation<FF>(), proof_system::PermutationRelation<FF>());
 
     // Check that each relation is satisfied across each row of the prover polynomials
     check_relation<Flavor>(std::get<0>(relations), circuit_size, prover_polynomials, params);
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
index e3f0ae21409b..e3702752e406 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.hpp
@@ -2,11 +2,11 @@
 #include "barretenberg/common/serialize.hpp"
 #include "barretenberg/common/throw_or_abort.hpp"
 #include "barretenberg/honk/proof_system/prover.hpp"
-#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "barretenberg/honk/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/honk/transcript/transcript.hpp"
 #include "barretenberg/honk/utils/grand_product_delta.hpp"
 #include "barretenberg/polynomials/univariate.hpp"
+#include "barretenberg/proof_system/relations/relation_parameters.hpp"
 #include "sumcheck_round.hpp"
 
 namespace proof_system::honk::sumcheck {
@@ -70,8 +70,9 @@ template <typename Flavor> class SumcheckProver {
      *
      * @details
      */
-    SumcheckOutput<Flavor> prove(auto full_polynomials,
-                                 const proof_system::RelationParameters<FF>& relation_parameters) // pass by value, not by reference
+    SumcheckOutput<Flavor> prove(
+        auto full_polynomials,
+        const proof_system::RelationParameters<FF>& relation_parameters) // pass by value, not by reference
     {
         auto [alpha, zeta] = transcript.get_challenges("Sumcheck:alpha", "Sumcheck:zeta");
 
@@ -172,7 +173,8 @@ template <typename Flavor> class SumcheckVerifier {
      * @param relation_parameters
      * @param transcript
      */
-    std::optional<SumcheckOutput<Flavor>> verify(const proof_system::RelationParameters<FF>& relation_parameters, auto& transcript)
+    std::optional<SumcheckOutput<Flavor>> verify(const proof_system::RelationParameters<FF>& relation_parameters,
+                                                 auto& transcript)
     {
         bool verified(true);
 
@@ -192,8 +194,9 @@ template <typename Flavor> class SumcheckVerifier {
         for (size_t round_idx = 0; round_idx < multivariate_d; round_idx++) {
             // Obtain the round univariate from the transcript
             std::string round_univariate_label = "Sumcheck:univariate_" + std::to_string(round_idx);
-            auto round_univariate = transcript.template receive_from_prover<
-                barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>>(round_univariate_label);
+            auto round_univariate =
+                transcript.template receive_from_prover<barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>>(
+                    round_univariate_label);
 
             bool checked = round.check_sum(round_univariate);
             verified = verified && checked;
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
index fba343da1471..1d1b77e21154 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck.test.cpp
@@ -1,4 +1,3 @@
-#include "sumcheck.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
 #include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
@@ -11,6 +10,7 @@
 #include "barretenberg/proof_system/relations/lookup_relation.hpp"
 #include "barretenberg/proof_system/relations/permutation_relation.hpp"
 #include "barretenberg/proof_system/relations/ultra_arithmetic_relation.hpp"
+#include "sumcheck.hpp"
 #include <gtest/gtest.h>
 
 using namespace proof_system::honk;
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
index 1b72039573a5..42dad0896013 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.hpp
@@ -121,10 +121,11 @@ template <typename Flavor> class SumcheckProverRound {
      * values. Most likely this will end up being S_l(0), ... , S_l(t-1) where t is around 12. At the end, reset all
      * univariate accumulators to be zero.
      */
-    barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH> compute_univariate(auto& polynomials,
-                                                                  const proof_system::RelationParameters<FF>& relation_parameters,
-                                                                  const barretenberg::PowUnivariate<FF>& pow_univariate,
-                                                                  const FF alpha)
+    barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH> compute_univariate(
+        auto& polynomials,
+        const proof_system::RelationParameters<FF>& relation_parameters,
+        const barretenberg::PowUnivariate<FF>& pow_univariate,
+        const FF alpha)
     {
         // Precompute the vector of required powers of zeta
         // TODO(luke): Parallelize this
@@ -440,12 +441,12 @@ template <typename Flavor> class SumcheckVerifierRound {
      * @param round_challenge u_l
      * @return FF sigma_{l+1} = S^l(u_l)
      */
-    FF compute_next_target_sum(barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>& univariate, FF& round_challenge)
+    FF compute_next_target_sum(barretenberg::Univariate<FF, MAX_RANDOM_RELATION_LENGTH>& univariate,
+                               FF& round_challenge)
     {
         // IMPROVEMENT(Cody): Use barycentric static method, maybe implement evaluation as member
         // function on Univariate.
-        auto barycentric =
-            barretenberg::BarycentricData<FF, MAX_RANDOM_RELATION_LENGTH, MAX_RANDOM_RELATION_LENGTH>();
+        auto barycentric = barretenberg::BarycentricData<FF, MAX_RANDOM_RELATION_LENGTH, MAX_RANDOM_RELATION_LENGTH>();
         // Evaluate T^{l}(u_{l})
         target_total_sum = barycentric.evaluate(univariate, round_challenge);
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
index e6089f875d14..33cc485cb2f7 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/sumcheck/sumcheck_round.test.cpp
@@ -20,9 +20,9 @@ using namespace proof_system::honk;
 using namespace proof_system::honk::sumcheck;
 using namespace proof_system;
 
-using barretenberg::Univariate;
-using barretenberg::PowUnivariate;
 using barretenberg::BarycentricData;
+using barretenberg::PowUnivariate;
+using barretenberg::Univariate;
 
 using Flavor = flavor::Standard;
 using FF = typename Flavor::FF;
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
index 89b26fa53fda..8865e473fda6 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/honk/transcript/transcript.test.cpp
@@ -2,8 +2,8 @@
 #include "barretenberg/honk/composer/standard_composer.hpp"
 #include "barretenberg/honk/composer/ultra_composer.hpp"
 #include "barretenberg/honk/flavor/standard.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"
+#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/flavor/flavor.hpp"
 #include "transcript.hpp"
 #include <gtest/gtest.h>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
index 2dcda2c229d9..a166fc5beac6 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/barycentric.test.cpp
@@ -1,5 +1,5 @@
-#include "barycentric.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "barycentric.hpp"
 #include <gtest/gtest.h>
 
 namespace barretenberg::test_barycentric {
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
index 9c5a725d159b..58355c453c63 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/polynomials/pow.test.cpp
@@ -1,5 +1,5 @@
-#include "pow.hpp"
 #include "barretenberg/ecc/curves/bn254/fr.hpp"
+#include "pow.hpp"
 #include <gtest/gtest.h>
 
 namespace barretenberg::test_pow {
@@ -18,14 +18,14 @@ TEST(SumcheckPow, FullPowConsistency)
         u_i = FF::random_element();
         pow_univariate.partially_evaluate(u_i);
     }
-    
+
     FF zeta_power = zeta;
     FF expected_eval = 1;
     for (auto& u_i : variables) {
         expected_eval *= FF(1) - u_i + u_i * zeta_power;
         zeta_power *= zeta_power;
     }
-    
+
     EXPECT_EQ(pow_univariate.partial_evaluation_constant, expected_eval);
 }
 } // namespace barretenberg::test_pow
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
index af934fe7069e..7f6baf00b4cd 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/flavor/flavor.hpp
@@ -65,8 +65,8 @@
 
 #pragma once
 #include "barretenberg/polynomials/barycentric.hpp"
-#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/polynomials/evaluation_domain.hpp"
+#include "barretenberg/polynomials/univariate.hpp"
 #include "barretenberg/proof_system/types/circuit_type.hpp"
 #include <array>
 #include <concepts>
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
index 91997903d8ce..05078bf638fd 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/auxiliary_relation.hpp
@@ -8,7 +8,7 @@ namespace proof_system {
 template <typename FF_> class AuxiliaryRelationImpl {
   public:
     using FF = FF_;
-    
+
     // 1 + polynomial degree of this relation
     static constexpr size_t RELATION_LENGTH = 6;
 
diff --git a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
index 972f98e6ed45..a267e6735522 100644
--- a/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
+++ b/circuits/cpp/barretenberg/cpp/src/barretenberg/proof_system/relations/permutation_relation.hpp
@@ -14,7 +14,7 @@ template <typename FF_> class PermutationRelationImpl {
 
     static constexpr size_t LEN_1 = 5; // grand product construction sub-relation
     static constexpr size_t LEN_2 = 3; // left-shiftable polynomial sub-relation
-    static constexpr std::tuple<size_t, size_t> SUBRELATION_LENGTHS = {LEN_1, LEN_2};
+    static constexpr std::tuple<size_t, size_t> SUBRELATION_LENGTHS = { LEN_1, LEN_2 };
     template <template <size_t...> typename SubrelationAccumulatorsTemplate>
     using GetAccumulatorTypes = SubrelationAccumulatorsTemplate<LEN_1, LEN_2>;
     template <typename T> using Accumulator = typename std::tuple_element<0, typename T::Accumulators>::type;
diff --git a/docs/docs/dev_docs/contracts/state_variables.md b/docs/docs/dev_docs/contracts/state_variables.md
index e2e7242f793f..d11e7fb8b2d2 100644
--- a/docs/docs/dev_docs/contracts/state_variables.md
+++ b/docs/docs/dev_docs/contracts/state_variables.md
@@ -28,7 +28,7 @@ The BoolSerialisationMethods is part of the Aztec stdlib:
 
 It contains methods that instruct its PublicState wrapper how to serialise and deserialise a boolean to and from a Field, which is the data type being saved in the public state tree.
 
-The Aztec stdlib provides serialization methods for various common types. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation) for the complete list.
+The Aztec stdlib provides serialization methods for various common types. Check [here](https://github.com/AztecProtocol/aztec-packages/blob/master/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation) for the complete list.
 
 ### Custom types
 
@@ -36,7 +36,7 @@ It's possible to create a public state for any types. Simply define methods that
 
 The methods should be implemented in a struct that conforms to the following interface:
 
-#include_code TypeSerialisationInterface /yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr rust
+#include_code TypeSerialisationInterface /yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr rust
 
 For example, to create a public state for the following type:
 
@@ -118,7 +118,7 @@ Notes are the fundamental elements in the private world.
 
 A note should conform to the following interface:
 
-#include_code NoteInterface /yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr rust
+#include_code NoteInterface /yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr rust
 
 The interplay between a private state variable and its notes can be confusing. Here's a summary to aid intuition:
 
@@ -243,7 +243,7 @@ Because of this limit, we should always consider using the second argument `Note
 
 `NoteGetterOptions` encapsulates a set of configurable options for filtering and retrieving a selection of notes from a database:
 
-#include_code NoteGetterOptions /yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr rust
+#include_code NoteGetterOptions /yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr rust
 
 Developers can design instances of `NoteGetterOptions`, to determine how notes should be filtered and returned to the functions of their smart contracts.
 
diff --git a/docs/docs/dev_docs/getting_started/noir_contracts.md b/docs/docs/dev_docs/getting_started/noir_contracts.md
index df52447c4d8f..e6b9e3a96f80 100644
--- a/docs/docs/dev_docs/getting_started/noir_contracts.md
+++ b/docs/docs/dev_docs/getting_started/noir_contracts.md
@@ -61,7 +61,7 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/noir-aztec" }
+aztec = { git="https://github.com/AztecProtocol/aztec-packages", tag="master", directory="yarn-project/noir-libs/aztec-noir" }
 ```
 
 You are now ready to write your own contracts! 
diff --git a/docs/docs/dev_docs/wallets/writing_an_account_contract.md b/docs/docs/dev_docs/wallets/writing_an_account_contract.md
index a305e0015c11..b6ddc219c5db 100644
--- a/docs/docs/dev_docs/wallets/writing_an_account_contract.md
+++ b/docs/docs/dev_docs/wallets/writing_an_account_contract.md
@@ -32,7 +32,7 @@ Public Key:  0x0ede151adaef1cfcc1b3e152ea39f00c5cda3f3857cef00decb049d283672dc71
 
 The important part of this contract is the `entrypoint` function, which will be the first function executed in any transaction originated from this account. This function has two main responsibilities: 1) authenticating the transaction and 2) executing calls. It receives a `payload` with the list of function calls to execute, as well as a signature over that payload.
 
-#include_code entrypoint-struct yarn-project/noir-libs/noir-aztec/src/entrypoint.nr rust
+#include_code entrypoint-struct yarn-project/noir-libs/aztec-noir/src/entrypoint.nr rust
 
 :::info
 Using the `EntrypointPayload` struct is not mandatory. You can package the instructions to be carried out by your account contract however you want. However, the entrypoint payload already provides a set of helper functions, both in Noir and Typescript, that can save you a lot of time when writing a new account contract.
@@ -48,7 +48,7 @@ We authenticate the transaction. To do this, we serialise and Pedersen-hash the
 
 Last, we execute the calls in the payload struct. The `execute_calls` helper function runs through the private and public calls included in the entrypoint payload and executes them:
 
-#include_code entrypoint-execute-calls yarn-project/noir-libs/noir-aztec/src/entrypoint.nr rust
+#include_code entrypoint-execute-calls yarn-project/noir-libs/aztec-noir/src/entrypoint.nr rust
 
 Note the usage of the `_with_packed_args` variant of [`call_public_function` and `call_private_function`](../contracts/functions.md#calling-functions). Due to Noir limitations, we cannot include more than a small number of arguments in a function call. However, we can bypass this restriction by using a hash of the arguments in a function call, which gets automatically expanded to the full set of arguments when the nested call is executed. We call this _argument packing_.
 
diff --git a/yarn-project/acir-simulator/src/public/executor.ts b/yarn-project/acir-simulator/src/public/executor.ts
index bdfd538e490e..7c7ce906dd39 100644
--- a/yarn-project/acir-simulator/src/public/executor.ts
+++ b/yarn-project/acir-simulator/src/public/executor.ts
@@ -7,6 +7,7 @@ import {
   FunctionSelector,
   GlobalVariables,
   HistoricBlockData,
+  RETURN_VALUES_LENGTH,
 } from '@aztec/circuits.js';
 import { padArrayEnd } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
@@ -33,9 +34,6 @@ import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
 import { PublicExecution, PublicExecutionResult } from './execution.js';
 import { ContractStorageActionsCollector } from './state_actions.js';
 
-// Copied from crate::abi at noir-contracts/src/contracts/noir-aztec/src/abi.nr
-const NOIR_MAX_RETURN_VALUES = 4;
-
 /**
  * Handles execution of public functions.
  */
@@ -137,7 +135,7 @@ export class PublicExecutor {
 
         nestedExecutions.push(childExecutionResult);
         this.log(`Returning from nested call: ret=${childExecutionResult.returnValues.join(', ')}`);
-        return padArrayEnd(childExecutionResult.returnValues, Fr.ZERO, NOIR_MAX_RETURN_VALUES).map(toACVMField);
+        return padArrayEnd(childExecutionResult.returnValues, Fr.ZERO, RETURN_VALUES_LENGTH).map(toACVMField);
       },
       emitUnencryptedLog: args => {
         // https://github.com/AztecProtocol/aztec-packages/issues/885
diff --git a/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts b/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts
index 0a6dc8b15590..56bc26c92073 100644
--- a/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts
+++ b/yarn-project/aztec.js/src/account/entrypoint/entrypoint_payload.ts
@@ -5,7 +5,7 @@ import { FunctionCall, PackedArguments, emptyFunctionCall } from '@aztec/types';
 
 import partition from 'lodash.partition';
 
-// These must match the values defined in yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
+// These must match the values defined in yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
 export const ACCOUNT_MAX_PRIVATE_CALLS = 2;
 export const ACCOUNT_MAX_PUBLIC_CALLS = 2;
 
diff --git a/yarn-project/aztec.js/src/utils/cheat_codes.ts b/yarn-project/aztec.js/src/utils/cheat_codes.ts
index 6321e0ff135e..1dc12106108a 100644
--- a/yarn-project/aztec.js/src/utils/cheat_codes.ts
+++ b/yarn-project/aztec.js/src/utils/cheat_codes.ts
@@ -234,7 +234,7 @@ export class AztecCheatCodes {
    */
   public computeSlotInMap(baseSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr {
     // Based on `at` function in
-    // aztec3-packages/yarn-project/noir-contracts/src/contracts/noir-aztec/src/state_vars/map.nr
+    // aztec3-packages/yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
     return Fr.fromBuffer(
       pedersenPlookupCommitInputs(
         this.wasm,
diff --git a/yarn-project/circuits.js/src/cbind/constants.in.ts b/yarn-project/circuits.js/src/cbind/constants.in.ts
index 09a621cf895e..68bf902704bb 100644
--- a/yarn-project/circuits.js/src/cbind/constants.in.ts
+++ b/yarn-project/circuits.js/src/cbind/constants.in.ts
@@ -39,7 +39,7 @@ async function main(): Promise<void> {
     processEnumNoir(privateStateNoteGeneratorIndexEnum, 'PRIVATE_STATE_NOTE_GENERATOR_INDEX__') +
     processEnumNoir(privateStateTypeEnum, 'PRIVATE_STATE_TYPE__');
 
-  const noirTargetPath = join(__dirname, '../../../noir-libs/noir-aztec/src/constants_gen.nr');
+  const noirTargetPath = join(__dirname, '../../../noir-libs/aztec-noir/src/constants_gen.nr');
   fs.writeFileSync(noirTargetPath, resultNoir);
 
   // Solidity
diff --git a/yarn-project/noir-contracts/README.md b/yarn-project/noir-contracts/README.md
index 0bc3fd8b3456..b4631099f63b 100644
--- a/yarn-project/noir-contracts/README.md
+++ b/yarn-project/noir-contracts/README.md
@@ -122,7 +122,7 @@ It has prebuilt binaries and is super easy to install using `noirup`
    compiler_version = "0.7.1"
 
    [dependencies]
-   aztec = { path = "../../../../noir-libs/noir-aztec" }
+   aztec = { path = "../../../../noir-libs/aztec-noir" }
    ```
 
 4. Replace the content of the generated `example_contract/src/main.nr` file with your contract code.
diff --git a/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
index 40f9e3fbffaa..58853dc1a570 100644
--- a/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml
index ee16960f6840..013af3ce22e7 100644
--- a/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/child_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml
index add81444e03b..7826fffbf0d0 100644
--- a/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/docs_example_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml
index b12c667a3a77..4b8208cc51be 100644
--- a/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/easy_private_token_contract/Nargo.toml
@@ -5,6 +5,6 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 easy_private_state = { path = "../../../../noir-libs/easy-private-state"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml
index fafe0d80e0d7..999b75a218a6 100644
--- a/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/ecdsa_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml
index 1659fd53bd1d..4077357a075c 100644
--- a/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/escrow_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml
index 1dfaf41bec92..21840bab59bb 100644
--- a/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/import_test_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
index 4efdd16534d9..8233a8c530c6 100644
--- a/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/lending_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 safe_math = { path = "../../../../noir-libs/safe-math" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml
index e65ae99c1465..86574e53fc14 100644
--- a/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/multi_transfer_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
index dd0dcb29369a..42a0a9313a4b 100644
--- a/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/native_token_contract/Nargo.toml
@@ -5,6 +5,6 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 non_native = { path = "../non_native_token_contract"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml
index a114d29bd83d..d6c7fef03e18 100644
--- a/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/non_native_token_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
index 5c12622f00f3..850b3ad14e5b 100644
--- a/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/parent_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml
index 052b4bff7307..1c0e84969da3 100644
--- a/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/pending_commitments_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
diff --git a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml
index 0e36de1f22cf..4a8af37b776e 100644
--- a/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/pokeable_token_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml
index 51ff213ea6dc..be6246ac397b 100644
--- a/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/price_feed_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml
index b198e85407dd..9f21c40d77ee 100644
--- a/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/private_token_airdrop_contract/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml
index 4bdd80daff0d..0eb35564eecc 100644
--- a/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/private_token_contract/Nargo.toml
@@ -7,6 +7,6 @@ type = "contract"
 
 [dependencies]
 # highlight-next-line:importing-aztec
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
 value_note = { path = "../../../../noir-libs/value-note"}
 # docs:end:importing-aztec
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml
index 3f6be8e4142f..04489c04c7ed 100644
--- a/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/public_token_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml
index 1ea6bf3dbe64..84c123fadee5 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml
index 922b93267d0f..77bd89399b3f 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_auth_witness_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml
index 4c754d368efc..218d93ac79dc 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_hardcoded_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
\ No newline at end of file
+aztec = { path = "../../../../noir-libs/aztec-noir" }
\ No newline at end of file
diff --git a/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml
index f21b6ca513cc..d1eff41f9ae9 100644
--- a/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/schnorr_single_key_account_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml
index fd7213c7a9ac..1d564c16ddd4 100644
--- a/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/test_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml b/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml
index d02ae559dd16..21daac464fdb 100644
--- a/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml
+++ b/yarn-project/noir-contracts/src/contracts/uniswap_contract/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.1"
 type = "contract"
 
 [dependencies]
-aztec = { path = "../../../../noir-libs/noir-aztec" }
+aztec = { path = "../../../../noir-libs/aztec-noir" }
diff --git a/yarn-project/noir-libs/noir-aztec/Nargo.toml b/yarn-project/noir-libs/aztec-noir/Nargo.toml
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/Nargo.toml
rename to yarn-project/noir-libs/aztec-noir/Nargo.toml
diff --git a/yarn-project/noir-libs/noir-aztec/src/abi.nr b/yarn-project/noir-libs/aztec-noir/src/abi.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/abi.nr
rename to yarn-project/noir-libs/aztec-noir/src/abi.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/auth.nr b/yarn-project/noir-libs/aztec-noir/src/auth.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/auth.nr
rename to yarn-project/noir-libs/aztec-noir/src/auth.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/constants_gen.nr b/yarn-project/noir-libs/aztec-noir/src/constants_gen.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/constants_gen.nr
rename to yarn-project/noir-libs/aztec-noir/src/constants_gen.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/context.nr b/yarn-project/noir-libs/aztec-noir/src/context.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/context.nr
rename to yarn-project/noir-libs/aztec-noir/src/context.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/entrypoint.nr b/yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/entrypoint.nr
rename to yarn-project/noir-libs/aztec-noir/src/entrypoint.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/lib.nr b/yarn-project/noir-libs/aztec-noir/src/lib.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/lib.nr
rename to yarn-project/noir-libs/aztec-noir/src/lib.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/log.nr b/yarn-project/noir-libs/aztec-noir/src/log.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/log.nr
rename to yarn-project/noir-libs/aztec-noir/src/log.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging.nr b/yarn-project/noir-libs/aztec-noir/src/messaging.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/get_commitment_getter_data.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/get_commitment_getter_data.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/get_commitment_getter_data.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr b/yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message_getter_data.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/messaging/l1_to_l2_message_getter_data.nr
rename to yarn-project/noir-libs/aztec-noir/src/messaging/l1_to_l2_message_getter_data.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note.nr b/yarn-project/noir-libs/aztec-noir/src/note.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note.nr
rename to yarn-project/noir-libs/aztec-noir/src/note.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/lifecycle.nr b/yarn-project/noir-libs/aztec-noir/src/note/lifecycle.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/lifecycle.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/lifecycle.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_getter.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_getter.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_getter.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_getter.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_getter_options.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_getter_options.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_hash.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_hash.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_hash.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_hash.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_header.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_header.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_header.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_header.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_interface.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_interface.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/note_viewer_options.nr b/yarn-project/noir-libs/aztec-noir/src/note/note_viewer_options.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/note_viewer_options.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/note_viewer_options.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/note/utils.nr b/yarn-project/noir-libs/aztec-noir/src/note/utils.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/note/utils.nr
rename to yarn-project/noir-libs/aztec-noir/src/note/utils.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle.nr b/yarn-project/noir-libs/aztec-noir/src/oracle.nr
similarity index 78%
rename from yarn-project/noir-libs/noir-aztec/src/oracle.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle.nr
index 838821db45f8..056617ed42f9 100644
--- a/yarn-project/noir-libs/noir-aztec/src/oracle.nr
+++ b/yarn-project/noir-libs/aztec-noir/src/oracle.nr
@@ -1,3 +1,7 @@
+// docs:start:oracles-module
+/// Oracles module
+// docs:end:oracles-module
+
 mod arguments;
 mod call_private_function;
 mod context;
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/arguments.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/arguments.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/arguments.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/arguments.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/call_private_function.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/call_private_function.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/call_private_function.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/call_private_function.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/compute_selector.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/compute_selector.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/compute_selector.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/compute_selector.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/context.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/context.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/context.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/context.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/create_commitment.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/create_commitment.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/create_commitment.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/create_commitment.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/debug_log.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/debug_log.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/debug_log.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/debug_log.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/enqueue_public_function_call.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/enqueue_public_function_call.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/enqueue_public_function_call.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_commitment.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_commitment.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_commitment.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_commitment.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_l1_to_l2_message.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_l1_to_l2_message.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_l1_to_l2_message.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_l1_to_l2_message.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_public_key.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_public_key.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_public_key.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_public_key.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/get_secret_key.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/get_secret_key.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/get_secret_key.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/logs.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/logs.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/logs.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/logs.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/notes.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/notes.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/notes.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/public_call.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/public_call.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/public_call.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/public_call.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/rand.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/rand.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/rand.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/rand.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/oracle/storage.nr b/yarn-project/noir-libs/aztec-noir/src/oracle/storage.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/oracle/storage.nr
rename to yarn-project/noir-libs/aztec-noir/src/oracle/storage.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/private_call_stack_item.nr b/yarn-project/noir-libs/aztec-noir/src/private_call_stack_item.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/private_call_stack_item.nr
rename to yarn-project/noir-libs/aztec-noir/src/private_call_stack_item.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/public_call_stack_item.nr b/yarn-project/noir-libs/aztec-noir/src/public_call_stack_item.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/public_call_stack_item.nr
rename to yarn-project/noir-libs/aztec-noir/src/public_call_stack_item.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/immutable_singleton.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/immutable_singleton.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/immutable_singleton.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/immutable_singleton.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/map.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/map.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/map.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/public_state.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/public_state.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/public_state.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/public_state.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/set.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/set.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/set.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/set.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/state_vars/singleton.nr b/yarn-project/noir-libs/aztec-noir/src/state_vars/singleton.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/state_vars/singleton.nr
rename to yarn-project/noir-libs/aztec-noir/src/state_vars/singleton.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types.nr b/yarn-project/noir-libs/aztec-noir/src/types.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types.nr
rename to yarn-project/noir-libs/aztec-noir/src/types.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/grumpkin_scalar.nr b/yarn-project/noir-libs/aztec-noir/src/types/grumpkin_scalar.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/grumpkin_scalar.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/grumpkin_scalar.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/point.nr b/yarn-project/noir-libs/aztec-noir/src/types/point.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/point.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/point.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/bool_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/bool_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/bool_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/bool_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/field_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/field_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/field_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/field_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/u32_serialisation.nr b/yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/u32_serialisation.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/type_serialisation/u32_serialisation.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/type_serialisation/u32_serialisation.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/types/vec.nr b/yarn-project/noir-libs/aztec-noir/src/types/vec.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/types/vec.nr
rename to yarn-project/noir-libs/aztec-noir/src/types/vec.nr
diff --git a/yarn-project/noir-libs/noir-aztec/src/utils.nr b/yarn-project/noir-libs/aztec-noir/src/utils.nr
similarity index 100%
rename from yarn-project/noir-libs/noir-aztec/src/utils.nr
rename to yarn-project/noir-libs/aztec-noir/src/utils.nr
diff --git a/yarn-project/noir-libs/easy-private-state/Nargo.toml b/yarn-project/noir-libs/easy-private-state/Nargo.toml
index 04f0f4266cf8..eef8798d8c85 100644
--- a/yarn-project/noir-libs/easy-private-state/Nargo.toml
+++ b/yarn-project/noir-libs/easy-private-state/Nargo.toml
@@ -5,5 +5,5 @@ compiler_version = "0.7.1"
 type = "lib"
 
 [dependencies]
-aztec = { path = "../noir-aztec" }
+aztec = { path = "../aztec-noir" }
 value_note = { path = "../value-note" }
\ No newline at end of file
diff --git a/yarn-project/noir-libs/value-note/Nargo.toml b/yarn-project/noir-libs/value-note/Nargo.toml
index e20a368c6510..7f527d67f21c 100644
--- a/yarn-project/noir-libs/value-note/Nargo.toml
+++ b/yarn-project/noir-libs/value-note/Nargo.toml
@@ -5,4 +5,4 @@ compiler_version = "0.7.1"
 type = "lib"
 
 [dependencies]
-aztec = { path = "../noir-aztec" }
\ No newline at end of file
+aztec = { path = "../aztec-noir" }
\ No newline at end of file