diff --git a/src/NumericalInitialization.cc b/src/NumericalInitialization.cc
index f8b1d6b9c8ea29ee1b98d8c5770ac700b5859cc6..8c2e32e3912da91b0868445fd91f53c4e80ac0df 100644
--- a/src/NumericalInitialization.cc
+++ b/src/NumericalInitialization.cc
@@ -534,16 +534,16 @@ HistvalFileStatement::writeJsonOutput(ostream &output) const
   output << "}";
 }
 
-HomotopyStatement::HomotopyStatement(homotopy_values_t homotopy_values_arg,
-                                     const SymbolTable &symbol_table_arg) :
+HomotopySetupStatement::HomotopySetupStatement(homotopy_values_t homotopy_values_arg,
+                                               const SymbolTable &symbol_table_arg) :
   homotopy_values{move(homotopy_values_arg)},
   symbol_table{symbol_table_arg}
 {
 }
 
 void
-HomotopyStatement::writeOutput(ostream &output, [[maybe_unused]] const string &basename,
-                               [[maybe_unused]] bool minimal_workspace) const
+HomotopySetupStatement::writeOutput(ostream &output, [[maybe_unused]] const string &basename,
+                                    [[maybe_unused]] bool minimal_workspace) const
 {
   output << "%" << endl
          << "% HOMOTOPY_SETUP instructions" << endl
@@ -567,7 +567,7 @@ HomotopyStatement::writeOutput(ostream &output, [[maybe_unused]] const string &b
 }
 
 void
-HomotopyStatement::writeJsonOutput(ostream &output) const
+HomotopySetupStatement::writeJsonOutput(ostream &output) const
 {
   output << R"({"statementName": "homotopy", )"
          << R"("values": [)";
diff --git a/src/NumericalInitialization.hh b/src/NumericalInitialization.hh
index fff69c74808b738074fffa8338d154d527ac9e5c..3e7d910fa25087a91dd4c80752f380e930d9e7fc 100644
--- a/src/NumericalInitialization.hh
+++ b/src/NumericalInitialization.hh
@@ -165,7 +165,7 @@ public:
   void writeJsonOutput(ostream &output) const override;
 };
 
-class HomotopyStatement : public Statement
+class HomotopySetupStatement : public Statement
 {
 public:
   //! Stores the declarations of homotopy_setup
@@ -175,8 +175,8 @@ private:
   const homotopy_values_t homotopy_values;
   const SymbolTable &symbol_table;
 public:
-  HomotopyStatement(homotopy_values_t homotopy_values_arg,
-                    const SymbolTable &symbol_table_arg);
+  HomotopySetupStatement(homotopy_values_t homotopy_values_arg,
+                         const SymbolTable &symbol_table_arg);
   void writeOutput(ostream &output, const string &basename, bool minimal_workspace) const override;
   void writeJsonOutput(ostream &output) const override;
 };
diff --git a/src/ParsingDriver.cc b/src/ParsingDriver.cc
index 314167085ac946bc09a472342ab301b2e078bc76..c01162e555686186d0dd22ee76b17787a0e2d489 100644
--- a/src/ParsingDriver.cc
+++ b/src/ParsingDriver.cc
@@ -795,7 +795,7 @@ ParsingDriver::end_histval(bool all_values_required)
 void
 ParsingDriver::end_homotopy()
 {
-  mod_file->addStatement(make_unique<HomotopyStatement>(move(homotopy_values), mod_file->symbol_table));
+  mod_file->addStatement(make_unique<HomotopySetupStatement>(move(homotopy_values), mod_file->symbol_table));
   homotopy_values.clear();
 }
 
diff --git a/src/ParsingDriver.hh b/src/ParsingDriver.hh
index 7ccee5e3462bc3b3732da77da0c34f3bb0e24685..5edf4fca616e3c1b66eb7fd39e1e602a5016920e 100644
--- a/src/ParsingDriver.hh
+++ b/src/ParsingDriver.hh
@@ -172,7 +172,7 @@ private:
   //! Temporary storage for histval blocks
   HistValStatement::hist_values_t hist_values;
   //! Temporary storage for homotopy_setup blocks
-  HomotopyStatement::homotopy_values_t homotopy_values;
+  HomotopySetupStatement::homotopy_values_t homotopy_values;
   //! Temporary storage for moment_calibration
   MomentCalibration::constraints_t moment_calibration_constraints;
   //! Temporary storage for irf_calibration