diff --git a/qt/scientific_interfaces/Indirect/IndirectFitData.cpp b/qt/scientific_interfaces/Indirect/IndirectFitData.cpp
index d343bd6bb778be4dd7acafd242ad297310ecf270..4f4f44b018b61e079e24000f3ca69d4778d5d6fd 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitData.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitData.cpp
@@ -141,7 +141,7 @@ std::string createExcludeRegionString(std::string regionString) {
 
 std::vector<MantidQt::CustomInterfaces::IDA::WorkspaceIndex>
 workspaceIndexVectorFromString(const std::string &listString) {
-  auto const intVec = vectorFromStringNew<int>(listString);
+  auto const intVec = vectorFromString<int>(listString);
   std::vector<MantidQt::CustomInterfaces::IDA::WorkspaceIndex> output;
   for (auto const i : intVec) {
     output.push_back(MantidQt::CustomInterfaces::IDA::WorkspaceIndex{i});
@@ -331,7 +331,7 @@ std::string IndirectFitData::getExcludeRegion(WorkspaceIndex spectrum) const {
 
 std::vector<double>
 IndirectFitData::excludeRegionsVector(WorkspaceIndex spectrum) const {
-  return vectorFromStringNew<double>(getExcludeRegion(spectrum));
+  return vectorFromString<double>(getExcludeRegion(spectrum));
 }
 
 void IndirectFitData::setSpectra(std::string const &spectra) {
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitData.h b/qt/scientific_interfaces/Indirect/IndirectFitData.h
index e6495a5a4f3ef12528a1f8f862a70cc021026e66..756d7e79bded6a135d5f2c28526146cf30c6ca8b 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitData.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitData.h
@@ -65,8 +65,8 @@ private:
   bool m_isContinuous;
 };
 
-template <typename F> struct ApplySpectraNew {
-  explicit ApplySpectraNew(F &&functor) : m_functor(std::forward<F>(functor)) {}
+template <typename F> struct ApplySpectra {
+  explicit ApplySpectra(F &&functor) : m_functor(std::forward<F>(functor)) {}
 
   void operator()(const Spectra &spectra) const {
     for (const auto &spectrum : spectra)
@@ -77,8 +77,8 @@ private:
   F m_functor;
 };
 
-template <typename F> struct ApplyEnumeratedSpectraNew {
-  ApplyEnumeratedSpectraNew(F &&functor,
+template <typename F> struct ApplyEnumeratedSpectra {
+  ApplyEnumeratedSpectra(F &&functor,
                             WorkspaceIndex start = WorkspaceIndex{0})
       : m_start(start), m_functor(std::forward<F>(functor)) {}
 
@@ -95,7 +95,7 @@ private:
 };
 
 template <class T>
-std::vector<T> vectorFromStringNew(const std::string &listString) {
+std::vector<T> vectorFromString(const std::string &listString) {
   try {
     return Mantid::Kernel::ArrayProperty<T>("vector", listString);
   } catch (const std::runtime_error &) {
@@ -131,14 +131,14 @@ public:
   std::vector<double> excludeRegionsVector(WorkspaceIndex spectrum) const;
 
   template <typename F> void applySpectra(F &&functor) const {
-    ApplySpectraNew<F>(std::forward<F>(functor))(m_spectra);
+    ApplySpectra<F>(std::forward<F>(functor))(m_spectra);
   }
 
   template <typename F>
   WorkspaceIndex
-  applyEnumeratedSpectraNew(F &&functor,
+  applyEnumeratedSpectra(F &&functor,
                          WorkspaceIndex start = WorkspaceIndex{0}) const {
-    return ApplyEnumeratedSpectraNew<F>(std::forward<F>(functor),
+    return ApplyEnumeratedSpectra<F>(std::forward<F>(functor),
                                         start)(m_spectra);
   }
 
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp
index 045f3b221c222ce3481ef77782f3babfc32f2d51..79a82a66fcb0ced9070a0ee2d6fb3aa1a28d376c 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.cpp
@@ -346,7 +346,7 @@ IndirectFitDataLegacy::getExcludeRegion(std::size_t spectrum) const {
 
 std::vector<double>
 IndirectFitDataLegacy::excludeRegionsVector(std::size_t spectrum) const {
-  return vectorFromString<double>(getExcludeRegion(spectrum));
+  return vectorFromStringLegacy<double>(getExcludeRegion(spectrum));
 }
 
 void IndirectFitDataLegacy::setSpectra(std::string const &spectra) {
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h
index 5f6640554150edfb30496d212e1f0ddd3ef809cd..33a61fa50dcc563e2a2505dbdbcc0a5f4c40a1e6 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitDataLegacy.h
@@ -23,7 +23,7 @@ namespace CustomInterfaces {
 namespace IDA {
 
 template <typename T>
-std::vector<T> vectorFromString(const std::string &listString) {
+std::vector<T> vectorFromStringLegacy(const std::string &listString) {
   try {
     return Mantid::Kernel::ArrayProperty<T>("vector", listString);
   } catch (const std::runtime_error &) {
@@ -40,7 +40,7 @@ std::vector<T> vectorFromString(const std::string &listString) {
 template <typename T> class DiscontinuousSpectra {
 public:
   explicit DiscontinuousSpectra(const std::string &str)
-      : m_str(str), m_vec(vectorFromString<T>(str)) {
+      : m_str(str), m_vec(vectorFromStringLegacy<T>(str)) {
     m_str.erase(std::remove_if(m_str.begin(), m_str.end(),
                                static_cast<int (*)(int)>(std::isspace)),
                 m_str.end());
@@ -93,8 +93,8 @@ private:
 using SpectraLegacy = boost::variant<DiscontinuousSpectra<std::size_t>,
                                std::pair<std::size_t, std::size_t>>;
 
-template <typename F> struct ApplySpectra : boost::static_visitor<> {
-  explicit ApplySpectra(F &&functor) : m_functor(std::forward<F>(functor)) {}
+template <typename F> struct ApplySpectraLegacy : boost::static_visitor<> {
+  explicit ApplySpectraLegacy(F &&functor) : m_functor(std::forward<F>(functor)) {}
 
   void operator()(const std::pair<std::size_t, std::size_t> &spectra) const {
     for (auto spectrum = spectra.first; spectrum <= spectra.second; ++spectrum)
@@ -111,8 +111,8 @@ private:
 };
 
 template <typename F>
-struct ApplyEnumeratedSpectra : boost::static_visitor<std::size_t> {
-  ApplyEnumeratedSpectra(F &&functor, std::size_t start = 0)
+struct ApplyEnumeratedSpectraLegacy : boost::static_visitor<std::size_t> {
+  ApplyEnumeratedSpectraLegacy(F &&functor, std::size_t start = 0)
       : m_start(start), m_functor(std::forward<F>(functor)) {}
 
   std::size_t
@@ -164,13 +164,13 @@ public:
   std::vector<double> excludeRegionsVector(std::size_t spectrum) const;
 
   template <typename F> void applySpectra(F &&functor) const {
-    boost::apply_visitor(ApplySpectra<F>(std::forward<F>(functor)), m_spectra);
+    boost::apply_visitor(ApplySpectraLegacy<F>(std::forward<F>(functor)), m_spectra);
   }
 
   template <typename F>
-  std::size_t applyEnumeratedSpectra(F &&functor, std::size_t start = 0) const {
+  std::size_t applyEnumeratedSpectraLegacy(F &&functor, std::size_t start = 0) const {
     return boost::apply_visitor(
-        ApplyEnumeratedSpectra<F>(std::forward<F>(functor), start), m_spectra);
+        ApplyEnumeratedSpectraLegacy<F>(std::forward<F>(functor), start), m_spectra);
   }
 
   void setSpectra(std::string const &spectra);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp b/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp
index be1753f2446440f9254ba65caa19009a53252959..48a8379c19f6b9c3b6b2ed2baaf58f7151f7b224 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitOutput.cpp
@@ -60,7 +60,7 @@ void applyEnumeratedData(F &&functor, const FitDataIterator &fitDataBegin,
                          const FitDataIterator &fitDataEnd) {
   IDAWorkspaceIndex start{0};
   for (auto it = fitDataBegin; it < fitDataEnd; ++it)
-    start = (*it)->applyEnumeratedSpectraNew(functor(it->get()), start);
+    start = (*it)->applyEnumeratedSpectra(functor(it->get()), start);
 }
 
 template <typename F>
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp b/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp
index 878e3d1e1e7c5da2046d5b0bb04f8696a843cb9d..52115747f3afbb455917c3ca2bb10dc83a98ccdb 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitOutputLegacy.cpp
@@ -58,7 +58,7 @@ void applyEnumeratedData(F &&functor, const FitDataIteratorLegacy &fitDataBegin,
                          const FitDataIteratorLegacy &fitDataEnd) {
   std::size_t start = 0;
   for (auto it = fitDataBegin; it < fitDataEnd; ++it)
-    start = (*it)->applyEnumeratedSpectra(functor(it->get()), start);
+    start = (*it)->applyEnumeratedSpectraLegacy(functor(it->get()), start);
 }
 
 template <typename F>
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp b/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp
index b0cb27dc1c6154ac4054e1e7589af3cf409f16f3..e9d3fe10d800874b393ffa519a1179efb49323ee 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitPlotModel.cpp
@@ -99,7 +99,7 @@ void setFunctionParameters(IFunction_sptr function, const std::string &category,
 void setFunctionParameters(MultiDomainFunction_sptr function,
                            const std::string &category,
                            const std::string &parameterName, double value) {
-  for (auto i = 0u; i < function->nFunctions(); ++i)
+  for (size_t i = 0u; i < function->nFunctions(); ++i)
     setFunctionParameters(function->getFunction(i), category, parameterName,
                           value);
 }
diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp b/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp
index a00f28308aa83c6b55b7e044507434c45b5a4118..5ccc85038a90bab81d785afaeafc64c683482962 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFittingModel.cpp
@@ -253,7 +253,7 @@ void cleanTemporaries(const std::string &base,
                          IDAWorkspaceIndex /*unused*/) {
     cleanTemporaries(base + "_" + std::to_string(index.value));
   };
-  fitData->applyEnumeratedSpectraNew(clean);
+  fitData->applyEnumeratedSpectra(clean);
 }
 
 void cleanTemporaries(const std::string &algorithmName,
@@ -892,7 +892,7 @@ IAlgorithm_sptr IndirectFittingModel::createSimultaneousFitWithEqualRange(
   auto const dataIndex = TableDatasetIndex{0};
   auto const workspaceIndex = getSpectra(dataIndex).front();
   auto exclude =
-      vectorFromStringNew<double>(getExcludeRegion(dataIndex, workspaceIndex));
+      vectorFromString<double>(getExcludeRegion(dataIndex, workspaceIndex));
   addInputDataToSimultaneousFit(fitAlgorithm, m_fittingData,
                                 getFittingRange(dataIndex, workspaceIndex),
                                 exclude);
diff --git a/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp b/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp
index 2f9e5578f0bf28fa82871874f9ca4d2ccc0ad681..74458c93f17bc241208224926a87c3857317eff6 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFittingModelLegacy.cpp
@@ -253,7 +253,7 @@ void cleanTemporaries(const std::string &base,
   const auto clean = [&](std::size_t index, std::size_t /*unused*/) {
     cleanTemporaries(base + "_" + std::to_string(index));
   };
-  fitData->applyEnumeratedSpectra(clean);
+  fitData->applyEnumeratedSpectraLegacy(clean);
 }
 
 void cleanTemporaries(
@@ -857,7 +857,7 @@ IAlgorithm_sptr IndirectFittingModelLegacy::createSimultaneousFitWithEqualRange(
   auto fitAlgorithm = simultaneousFitAlgorithm();
   addFitProperties(*fitAlgorithm, function, getResultXAxisUnit());
 
-  auto exclude = vectorFromString<double>(getExcludeRegion(0, 0));
+  auto exclude = vectorFromStringLegacy<double>(getExcludeRegion(0, 0));
   addInputDataToSimultaneousFit(fitAlgorithm, m_fittingData,
                                 getFittingRange(0, 0), exclude);
   fitAlgorithm->setProperty("OutputWorkspace", simultaneousFitOutputName());
diff --git a/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenter.cpp b/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenter.cpp
index 57bf64c73b4cb89503be4a79385875d55b2277ba..e9083006d260eb8ccb7c84c1373e90825b5609de 100644
--- a/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenter.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenter.cpp
@@ -224,7 +224,7 @@ void IndirectSpectrumSelectionPresenter::updateSpectraRange(
 void IndirectSpectrumSelectionPresenter::setMaskSpectraList(
     std::string const &spectra) {
   if (m_spectraError.empty()) {
-    auto const intVec = vectorFromStringNew<int>(spectra);
+    auto const intVec = vectorFromString<int>(spectra);
     std::vector<WorkspaceIndex> vec(intVec.size());
     std::transform(intVec.begin(), intVec.end(), vec.begin(),
                    [](int i) { return WorkspaceIndex{i}; });
diff --git a/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenterLegacy.cpp b/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenterLegacy.cpp
index e83e0eae4cd30b365821ea37cd9e2551d36bdd81..876d42ba9cb48fab9367bb44cf13862ea06e9953 100644
--- a/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenterLegacy.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectSpectrumSelectionPresenterLegacy.cpp
@@ -221,7 +221,7 @@ void IndirectSpectrumSelectionPresenterLegacy::updateSpectraRange(
 void IndirectSpectrumSelectionPresenterLegacy::setMaskSpectraList(
     std::string const &spectra) {
   if (m_spectraError.empty())
-    m_view->setMaskSpectraList(vectorFromString<std::size_t>(spectra));
+    m_view->setMaskSpectraList(vectorFromStringLegacy<std::size_t>(spectra));
   else
     m_view->setMaskSpectraList({});
 }