diff --git a/bb-pilcom/bb-pil-backend/templates/composer.cpp.hbs b/bb-pilcom/bb-pil-backend/templates/composer.cpp.hbs
index 5a7ca371099..fa9ca2e4daf 100644
--- a/bb-pilcom/bb-pil-backend/templates/composer.cpp.hbs
+++ b/bb-pilcom/bb-pil-backend/templates/composer.cpp.hbs
@@ -28,7 +28,7 @@ void {{name}}Composer::compute_witness(CircuitConstructor& circuit)
     AVM_TRACK_TIME("composer/create_prover:commitment_key",
                    compute_commitment_key(circuit_constructor.get_circuit_subgroup_size()));
     auto output_state = AVM_TRACK_TIME_V("composer/create_prover:construct_prover",
-                                         AvmProver(proving_key, proving_key->commitment_key));
+                                         {{name}}Prover(proving_key, proving_key->commitment_key));
     return output_state;
 }
 
diff --git a/bb-pilcom/bb-pil-backend/templates/flavor.cpp.hbs b/bb-pilcom/bb-pil-backend/templates/flavor.cpp.hbs
index b0639fc0221..57464923bb8 100644
--- a/bb-pilcom/bb-pil-backend/templates/flavor.cpp.hbs
+++ b/bb-pilcom/bb-pil-backend/templates/flavor.cpp.hbs
@@ -115,7 +115,7 @@ void {{name}}Flavor::Transcript::serialize_full_transcript() {
     }
 }
 
-AvmFlavor::ProvingKey::ProvingKey(const size_t circuit_size, const size_t num_public_inputs)
+{{name}}Flavor::ProvingKey::ProvingKey(const size_t circuit_size, const size_t num_public_inputs)
     : circuit_size(circuit_size)
     , evaluation_domain(bb::EvaluationDomain<FF>(circuit_size, circuit_size))
     , commitment_key(std::make_shared<CommitmentKey>(circuit_size + 1))
@@ -133,7 +133,7 @@ AvmFlavor::ProvingKey::ProvingKey(const size_t circuit_size, const size_t num_pu
  *
  * @return std::vector<FF>
  */
-std::vector<AvmFlavor::VerificationKey::FF> AvmFlavor::VerificationKey::to_field_elements() const
+std::vector<{{name}}Flavor::VerificationKey::FF> {{name}}Flavor::VerificationKey::to_field_elements() const
 {
     std::vector<FF> elements = { FF(circuit_size), FF(num_public_inputs) };
 
diff --git a/bb-pilcom/bb-pil-backend/templates/flavor.hpp.hbs b/bb-pilcom/bb-pil-backend/templates/flavor.hpp.hbs
index 6d0a7955f43..6c542d90aae 100644
--- a/bb-pilcom/bb-pil-backend/templates/flavor.hpp.hbs
+++ b/bb-pilcom/bb-pil-backend/templates/flavor.hpp.hbs
@@ -211,7 +211,7 @@ class {{name}}Flavor {
         auto get_witness_polynomials() { return WitnessEntities<Polynomial>::get_all(); }
         auto get_precomputed_polynomials() { return PrecomputedEntities<Polynomial>::get_all(); }
         auto get_selectors() { return PrecomputedEntities<Polynomial>::get_all(); }
-        auto get_to_be_shifted() { return AvmFlavor::get_to_be_shifted<Polynomial>(*this); }
+        auto get_to_be_shifted() { return {{name}}Flavor::get_to_be_shifted<Polynomial>(*this); }
         // This order matters! must match get_unshifted in entity classes
         auto get_all() { return concatenate(get_precomputed_polynomials(), get_witness_polynomials()); }
     };
diff --git a/bb-pilcom/bb-pil-backend/templates/full_row.hpp.hbs b/bb-pilcom/bb-pil-backend/templates/full_row.hpp.hbs
index 06ed2f202ca..b32e4e54059 100644
--- a/bb-pilcom/bb-pil-backend/templates/full_row.hpp.hbs
+++ b/bb-pilcom/bb-pil-backend/templates/full_row.hpp.hbs
@@ -41,6 +41,6 @@ template <typename FF> std::ostream& operator<<(std::ostream& os, {{name}}FullRo
 namespace bb {
 
 // Expose this in the bb namespace. For compatibility with the old witgen.
-using avm::AvmFullRow;
+using avm::{{name}}FullRow;
 
 } // namespace bb
\ No newline at end of file
diff --git a/bb-pilcom/bb-pil-backend/templates/verifier.cpp.hbs b/bb-pilcom/bb-pil-backend/templates/verifier.cpp.hbs
index 5157985d669..b68e916939f 100644
--- a/bb-pilcom/bb-pil-backend/templates/verifier.cpp.hbs
+++ b/bb-pilcom/bb-pil-backend/templates/verifier.cpp.hbs
@@ -26,7 +26,7 @@ namespace bb {
 using FF = {{name}}Flavor::FF;
 
 // Evaluate the given public input column over the multivariate challenge points
-inline FF AvmVerifier::evaluate_public_input_column(const std::vector<FF>& points, std::vector<FF> challenges)
+inline FF {{name}}Verifier::evaluate_public_input_column(const std::vector<FF>& points, std::vector<FF> challenges)
 {
     Polynomial<FF> polynomial(points, key->circuit_size);
     return polynomial.evaluate_mle(challenges);