diff --git a/RbcUkqcd.hpp b/RbcUkqcd.hpp
index f61002e..4118068 100644
--- a/RbcUkqcd.hpp
+++ b/RbcUkqcd.hpp
@@ -44,10 +44,10 @@ struct RbcUkqcd
   inline static constexpr EnsembleParameters m0LCDPar{0.0006203, 0.02661, 1.8, 2., 64, 128, 12};
 
   // C1M
-  inline static constexpr EnsembleParameters c1mLCDPar  {0.005, 0.0362, 1.8, 2., 24, 64, 24};
-  inline static constexpr EnsembleParameters c1m16LCDPar{0.005, 0.0362, 1.8, 2., 16, 64, 24};
-  inline static constexpr EnsembleParameters c1m20LCDPar{0.005, 0.0362, 1.8, 2., 20, 64, 24};
-  inline static constexpr EnsembleParameters c1m32LCDPar{0.005, 0.0362, 1.8, 2., 32, 64, 24};
+  inline static constexpr EnsembleParameters c1mIRLPar{0.005, 0.0362, 1.8, 2., 24, 64, 24};
+  inline static constexpr EnsembleParameters c1m16IRLPar{0.005, 0.0362, 1.8, 2., 16, 64, 24};
+  inline static constexpr EnsembleParameters c1m20IRLPar{0.005, 0.0362, 1.8, 2., 20, 64, 24};
+  inline static constexpr EnsembleParameters c1m32IRLPar{0.005, 0.0362, 1.8, 2., 32, 64, 24};
 
   // Runtime deflation parameters
   struct DeflationParameters
@@ -56,7 +56,7 @@ struct RbcUkqcd
     unsigned int nPoly, nStop, nK, nM;
   };
 
-  inline static constexpr DeflationParameters c1mDeflPar  {5.0e-04, 5.5, 101, 100, 110, 120};
+  inline static constexpr DeflationParameters c1mDeflPar{5.0e-04, 5.5, 101, 100, 110, 120};
   inline static constexpr DeflationParameters c1m16DeflPar{5.0e-03, 5.5, 101, 200, 220, 230};
   inline static constexpr DeflationParameters c1m20DeflPar{3.0e-03, 5.5, 101, 200, 220, 230};
   inline static constexpr DeflationParameters c1m32DeflPar{3.0e-06, 5.5, 101, 100, 110, 120};
@@ -69,24 +69,24 @@ struct RbcUkqcd
                                          const double residual = 1.0e-8);
   // Light solver: deflation at runtime
   static inline void
-  addLightRuntimeLCDSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
+  addLightRuntimeIRLSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
                            const RbcUkqcd::DeflationParameters &deflPar,
                            const std::string solverName, const std::string gaugeName,
                            const std::string gaugeTransform, const double residual);
 
-  static inline void addC1MLightRuntimeLCDSolver(Application &app, const std::string solverName,
+  static inline void addC1MLightRuntimeIRLSolver(Application &app, const std::string solverName,
                                                  const std::string gaugeName,
                                                  const std::string gaugeTransform,
                                                  const double residual = 1.0e-8);
-  static inline void addC1M16LightRuntimeLCDSolver(Application &app, const std::string solverName,
+  static inline void addC1M16LightRuntimeIRLSolver(Application &app, const std::string solverName,
                                                    const std::string gaugeName,
                                                    const std::string gaugeTransform,
                                                    const double residual = 1.0e-8);
-  static inline void addC1M20LightRuntimeLCDSolver(Application &app, const std::string solverName,
+  static inline void addC1M20LightRuntimeIRLSolver(Application &app, const std::string solverName,
                                                    const std::string gaugeName,
                                                    const std::string gaugeTransform,
                                                    const double residual = 1.0e-8);
-  static inline void addC1M32LightRuntimeLCDSolver(Application &app, const std::string solverName,
+  static inline void addC1M32LightRuntimeIRLSolver(Application &app, const std::string solverName,
                                                    const std::string gaugeName,
                                                    const std::string gaugeTransform,
                                                    const double residual = 1.0e-8);
@@ -183,17 +183,8 @@ void RbcUkqcd::addM0LightLCDSolver(Application &app, const std::string solverNam
   app.createModule<MSolver::MixedPrecisionRBPrecCGBatched>(solverName, solverPar);
 }
 
-// Light M0
-void RbcUkqcd::addM0LightLCDSolver(Application &app, const std::string solverName,
-                                   const std::string gaugeName, const std::string gaugeTransform,
-                                   const std::string eigenpackPath, const double residual)
-{
-  RbcUkqcd::addLightLCDSolver(app, RbcUkqcd::m0LCDPar, solverName, gaugeName, gaugeTransform,
-                              eigenpackPath, residual);
-}
-
 // Deflation at runtime
-void RbcUkqcd::addLightRuntimeLCDSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
+void RbcUkqcd::addLightRuntimeIRLSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
                                         const RbcUkqcd::DeflationParameters &deflPar,
                                         const std::string solverName, const std::string gaugeName,
                                         const std::string gaugeTransform, const double residual)
@@ -261,42 +252,45 @@ void RbcUkqcd::addLightRuntimeLCDSolver(Application &app, const RbcUkqcd::Ensemb
 }
 
 // Light C1M
-void RbcUkqcd::addC1MLightRuntimeLCDSolver(Application &app, const std::string solverName,
+void RbcUkqcd::addC1MLightRuntimeIRLSolver(Application &app, const std::string solverName,
                                            const std::string gaugeName,
                                            const std::string gaugeTransform, const double residual)
 {
-  RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1mLCDPar, RbcUkqcd::c1mDeflPar, solverName,
+  RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1mIRLPar, RbcUkqcd::c1mDeflPar, solverName,
                                      gaugeName, gaugeTransform, residual);
 }
 
 // Light C1M16
-void RbcUkqcd::addC1M16LightRuntimeLCDSolver(Application &app, const std::string solverName,
-                                           const std::string gaugeName,
-                                           const std::string gaugeTransform, const double residual)
+void RbcUkqcd::addC1M16LightRuntimeIRLSolver(Application &app, const std::string solverName,
+                                             const std::string gaugeName,
+                                             const std::string gaugeTransform,
+                                             const double residual)
 {
-  RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1m16LCDPar, RbcUkqcd::c1m16DeflPar, solverName,
+  RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1m16IRLPar, RbcUkqcd::c1m16DeflPar, solverName,
                                      gaugeName, gaugeTransform, residual);
 }
 
 // Light C1M20
-void RbcUkqcd::addC1M20LightRuntimeLCDSolver(Application &app, const std::string solverName,
-                                           const std::string gaugeName,
-                                           const std::string gaugeTransform, const double residual)
+void RbcUkqcd::addC1M20LightRuntimeIRLSolver(Application &app, const std::string solverName,
+                                             const std::string gaugeName,
+                                             const std::string gaugeTransform,
+                                             const double residual)
 {
-  RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1m20LCDPar, RbcUkqcd::c1m20DeflPar, solverName,
+  RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1m20IRLPar, RbcUkqcd::c1m20DeflPar, solverName,
                                      gaugeName, gaugeTransform, residual);
 }
 
 // Light C1M32
-void RbcUkqcd::addC1M32LightRuntimeLCDSolver(Application &app, const std::string solverName,
-                                           const std::string gaugeName,
-                                           const std::string gaugeTransform, const double residual)
+void RbcUkqcd::addC1M32LightRuntimeIRLSolver(Application &app, const std::string solverName,
+                                             const std::string gaugeName,
+                                             const std::string gaugeTransform,
+                                             const double residual)
 {
-  RbcUkqcd::addLightRuntimeLCDSolver(app, RbcUkqcd::c1m32LCDPar, RbcUkqcd::c1m32DeflPar, solverName,
+  RbcUkqcd::addLightRuntimeIRLSolver(app, RbcUkqcd::c1m32IRLPar, RbcUkqcd::c1m32DeflPar, solverName,
                                      gaugeName, gaugeTransform, residual);
 }
 
-// Strange 
+// Strange
 void RbcUkqcd::addStrangeSolver(Application &app, const RbcUkqcd::EnsembleParameters &par,
                                 const std::string solverName, const std::string gaugeName,
                                 const std::string gaugeTransform, const double residual)
@@ -348,7 +342,7 @@ void RbcUkqcd::addC1MStrangeSolver(Application &app, const std::string solverNam
                                    const std::string gaugeName, const std::string gaugeTransform,
                                    const double residual)
 {
-  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1mLCDPar, solverName, gaugeName, gaugeTransform,
+  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1mIRLPar, solverName, gaugeName, gaugeTransform,
                              residual);
 }
 
@@ -356,7 +350,7 @@ void RbcUkqcd::addC1M16StrangeSolver(Application &app, const std::string solverN
                                      const std::string gaugeName, const std::string gaugeTransform,
                                      const double residual)
 {
-  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m16LCDPar, solverName, gaugeName, gaugeTransform,
+  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m16IRLPar, solverName, gaugeName, gaugeTransform,
                              residual);
 }
 
@@ -364,7 +358,7 @@ void RbcUkqcd::addC1M20StrangeSolver(Application &app, const std::string solverN
                                      const std::string gaugeName, const std::string gaugeTransform,
                                      const double residual)
 {
-  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m20LCDPar, solverName, gaugeName, gaugeTransform,
+  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m20IRLPar, solverName, gaugeName, gaugeTransform,
                              residual);
 }
 
@@ -372,7 +366,7 @@ void RbcUkqcd::addC1M32StrangeSolver(Application &app, const std::string solverN
                                      const std::string gaugeName, const std::string gaugeTransform,
                                      const double residual)
 {
-  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m32LCDPar, solverName, gaugeName, gaugeTransform,
+  RbcUkqcd::addStrangeSolver(app, RbcUkqcd::c1m32IRLPar, solverName, gaugeName, gaugeTransform,
                              residual);
 }