diff --git a/src/witness_generator/generator.rs b/src/witness_generator/generator.rs
index 5c5df2f72..b8549290b 100644
--- a/src/witness_generator/generator.rs
+++ b/src/witness_generator/generator.rs
@@ -13,7 +13,7 @@ use super::machine::Machine;
 use super::util::contains_next_witness_ref;
 use super::{Constraint, EvalResult, FixedData, WitnessColumn};
 
-pub struct Evaluator<'a, QueryCallback>
+pub struct Generator<'a, QueryCallback>
 where
     QueryCallback: FnMut(&'a str) -> Option<AbstractNumberType>,
 {
@@ -44,7 +44,7 @@ enum EvaluationRow {
     Next,
 }
 
-impl<'a, QueryCallback> Evaluator<'a, QueryCallback>
+impl<'a, QueryCallback> Generator<'a, QueryCallback>
 where
     QueryCallback: FnMut(&str) -> Option<AbstractNumberType>,
 {
@@ -57,7 +57,7 @@ where
     ) -> Self {
         let witness_cols = fixed_data.witness_cols;
 
-        Evaluator {
+        Generator {
             fixed_data,
             identities,
             machines,
diff --git a/src/witness_generator/mod.rs b/src/witness_generator/mod.rs
index 1a3bbd63b..1d14af836 100644
--- a/src/witness_generator/mod.rs
+++ b/src/witness_generator/mod.rs
@@ -53,7 +53,7 @@ pub fn generate<'a>(
         machine_extractor::split_out_machines(&fixed, &analyzed.identities, &witness_cols);
     let (global_bit_constraints, identities) =
         bit_constraints::determine_global_constraints(&fixed, identities);
-    let mut evaluator = generator::Evaluator::new(
+    let mut generator = generator::Generator::new(
         &fixed,
         identities,
         global_bit_constraints,
@@ -64,18 +64,18 @@ pub fn generate<'a>(
     let mut values: Vec<(&str, Vec<AbstractNumberType>)> =
         witness_cols.iter().map(|p| (p.name, Vec::new())).collect();
     for row in 0..degree as DegreeType {
-        let row_values = evaluator.compute_next_row(row);
+        let row_values = generator.compute_next_row(row);
         for (col, v) in row_values.into_iter().enumerate() {
             values[col].1.push(v);
         }
     }
-    for (col, v) in evaluator.compute_next_row(0).into_iter().enumerate() {
+    for (col, v) in generator.compute_next_row(0).into_iter().enumerate() {
         if v != values[col].1[0] {
             eprintln!("Wrap-around value for column {} does not match: {} (wrap-around) vs. {} (first row).",
             witness_cols[col].name, v, values[col].1[0]);
         }
     }
-    for (name, data) in evaluator.machine_witness_col_values() {
+    for (name, data) in generator.machine_witness_col_values() {
         let (_, col) = values.iter_mut().find(|(n, _)| *n == name).unwrap();
         *col = data;
     }