diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
index bf1461248ef06486e68014238cfc48e87e953c21..a1ede6155b40d799ba3bf1ec9fdee08de4af290a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
@@ -207,7 +207,7 @@ namespace IDA
       "specMin = " + specMin + "\n"
       "specMax = " + specMax + "\n"
       "max_iterations = " + QString::number(maxIterations) + "\n"
-      "minimizer = '" + minimizerString("TODO-NAME") + "'\n"
+      "minimizer = '" + minimizerString("$outputname_$wsindex") + "'\n"
       "save = " + (m_uiForm.ckSave->isChecked() ? "True\n" : "False\n");
 
     if ( m_blnManager->value(m_properties["Convolve"]) ) pyInput += "convolve = True\n";
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
index cec7d2f7994bca99b0ef53cc9608f5c2eaeba2b8..35f97d2f46fa7f253309dd933c665f847ea00459 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IqtFit.cpp
@@ -165,7 +165,7 @@ namespace IDA
       "spec_min = " + specMin + "\n"
       "spec_max = " + specMax + "\n"
       "spec_max = None\n"
-      "minimizer = '" + minimizerString("TODO-NAME") + "'\n"
+      "minimizer = '" + minimizerString("$outputname_$wsindex") + "'\n"
       "max_iterations = " + QString::number(m_dblManager->value(m_properties["MaxIterations"])) + "\n";
 
     if (constrainIntens) pyInput += "constrain_intens = True \n";