diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/tests/full_poseidon2.test.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/tests/full_poseidon2.test.cpp
index e98a924aa7e5..61110c047444 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm/tests/full_poseidon2.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm/tests/full_poseidon2.test.cpp
@@ -13,7 +13,7 @@
 
 namespace tests_avm {
 using namespace bb;
-using namespace bb::Avm_vm;
+using namespace bb::avm;
 
 TEST(AvmFullPoseidon2, shouldHashCorrectly)
 {
@@ -58,7 +58,7 @@ TEST(AvmFullPoseidon2, shouldHashCorrectly)
     std::cerr << "Done computing polynomials..." << std::endl;
 
     std::cerr << "Accumulating relations..." << std::endl;
-    using Relation = Avm_vm::poseidon2_full<FF>;
+    using Relation = avm::poseidon2_full<FF>;
 
     typename Relation::SumcheckArrayOfValuesOverSubrelations result;
     for (auto& r : result) {
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/tests/fuzz_skippable.test.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/tests/fuzz_skippable.test.cpp
index 6dc6e89bac7b..b29b4a7ce291 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm/tests/fuzz_skippable.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm/tests/fuzz_skippable.test.cpp
@@ -10,7 +10,7 @@
 namespace tests_avm {
 
 using namespace bb;
-using namespace bb::Avm_vm;
+using namespace bb::avm;
 
 TEST(AvmSkippableTests, shouldSkipCorrectly)
 {
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/tests/merkle_tree.test.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/tests/merkle_tree.test.cpp
index 3c77ed80b74a..87156305e674 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm/tests/merkle_tree.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm/tests/merkle_tree.test.cpp
@@ -14,7 +14,7 @@
 
 namespace tests_avm {
 using namespace bb;
-using namespace bb::Avm_vm;
+using namespace bb::avm;
 
 TEST(AvmMerkleTree, shouldCheckMembership)
 {
@@ -76,7 +76,7 @@ TEST(AvmMerkleTree, shouldCheckMembership)
     std::cerr << "Done computing polynomials..." << std::endl;
 
     std::cerr << "Accumulating relations..." << std::endl;
-    using AllRelations = std::tuple<Avm_vm::merkle_tree<FF>, Avm_vm::poseidon2_full<FF>, Avm_vm::poseidon2<FF>>;
+    using AllRelations = std::tuple<avm::merkle_tree<FF>, avm::poseidon2_full<FF>, avm::poseidon2<FF>>;
 
     bb::constexpr_for<0, std::tuple_size_v<AllRelations>, 1>([&]<size_t i>() {
         using Relation = std::tuple_element_t<i, AllRelations>;
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/tests/range_check.test.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/tests/range_check.test.cpp
index 9b0dee869591..9664717369c3 100644
--- a/barretenberg/cpp/src/barretenberg/vm/avm/tests/range_check.test.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm/avm/tests/range_check.test.cpp
@@ -14,7 +14,7 @@
 namespace tests_avm {
 
 using namespace bb;
-using namespace bb::Avm_vm;
+using namespace bb::avm;
 
 TEST(AvmRangeCheck, shouldRangeCheck)
 {
@@ -74,7 +74,7 @@ TEST(AvmRangeCheck, shouldRangeCheck)
     std::cerr << "Done computing polynomials..." << std::endl;
 
     std::cerr << "Accumulating relations..." << std::endl;
-    using Relation = Avm_vm::range_check<FF>;
+    using Relation = avm::range_check<FF>;
 
     typename Relation::SumcheckArrayOfValuesOverSubrelations result;
     for (auto& r : result) {