diff --git a/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py b/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py
index ca747f13f2e814e419b4feaba44386cd43706f71..8a937ced4be95dd7a88ae17161ceb9287feac0ed 100644
--- a/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py
@@ -21,7 +21,7 @@ class POLDIAnalyseResidualsTest(stresstesting.MantidStressTest):
     def runResidualAnalysis(self, filenames):
         for dataFile in filenames:
             LoadSINQFile(Instrument='POLDI',Filename=dataFile + ".hdf",OutputWorkspace=dataFile)
-            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", RewriteSpectraMap=True)
+            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", OverwriteSpectraMap=True)
             PoldiTruncateData(InputWorkspace=dataFile,OutputWorkspace=dataFile)
             PoldiAnalyseResiduals(MeasuredCountData=dataFile, FittedCountData="%s_fortran_fit" % (dataFile),
                                   MaxIterations=1, OutputWorkspace=dataFile + "Residuals")
diff --git a/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py b/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py
index 70b4c876caf9ce02689d064558cc55dec98b2b9e..14fea1e2c4bed522b6cc27401616bc3d8351a795 100644
--- a/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py
@@ -20,7 +20,7 @@ class POLDIAutoCorrelationTest(stresstesting.MantidStressTest):
     def runAutoCorrelation(self, filenames):
         for dataFile in filenames:
             LoadSINQFile(Instrument='POLDI',Filename=dataFile + ".hdf",OutputWorkspace=dataFile)
-            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", RewriteSpectraMap=True)
+            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", OverwriteSpectraMap=True)
             PoldiTruncateData(InputWorkspace=dataFile,OutputWorkspace=dataFile)
             PoldiAutoCorrelation(InputWorkspace=dataFile, wlenmin=1.1, wlenmax=5.0, OutputWorkspace=dataFile + "Corr")
 
diff --git a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
index cf70b750a64f91575b85ef1c8d01e0e44edcd90a..4a5f1a0267e5f2db7c3aec241266c81120760cbd 100644
--- a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
@@ -20,7 +20,7 @@ class POLDIFitPeaks2DTest(stresstesting.MantidStressTest):
     def loadAndPrepareData(self, filenames):
         for dataFile in filenames:
             LoadSINQFile(Instrument='POLDI', Filename=dataFile + ".hdf", OutputWorkspace=dataFile)
-            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", RewriteSpectraMap=True)
+            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", OverwriteSpectraMap=True)
             PoldiTruncateData(InputWorkspace=dataFile, OutputWorkspace=dataFile)
 
     def loadReferencePeakData(self, filenames):
@@ -31,7 +31,7 @@ class POLDIFitPeaks2DTest(stresstesting.MantidStressTest):
         for dataFile in filenames:
             Load(Filename="%s_2d_reference_Spectrum.nxs" % (dataFile),
                  OutputWorkspace="%s_2d_reference_Spectrum" % (dataFile))
-            LoadInstrument(Workspace="%s_2d_reference_Spectrum" % (dataFile), InstrumentName="POLDI")
+            LoadInstrument(Workspace="%s_2d_reference_Spectrum" % (dataFile), InstrumentName="POLDI", OverwriteSpectraMap=True)
             Load(Filename="%s_1d_reference_Spectrum.nxs" % (dataFile),
                  OutputWorkspace="%s_1d_reference_Spectrum" % (dataFile))
 
diff --git a/Testing/SystemTests/tests/analysis/POLDIMergeTest.py b/Testing/SystemTests/tests/analysis/POLDIMergeTest.py
index b6dbe2fae15315cc951c8e3cb42045d2cbbfa267..6c7330e9356fcf93855a29a5bbb864c5cc5120b9 100644
--- a/Testing/SystemTests/tests/analysis/POLDIMergeTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIMergeTest.py
@@ -47,7 +47,7 @@ class POLDIMergeTest(stresstesting.MantidStressTest):
     def loadData(self, filenames):
         for dataFile in filenames:
             LoadSINQFile(Instrument='POLDI',Filename=dataFile + ".hdf",OutputWorkspace=dataFile)
-            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", RewriteSpectraMap=True)
+            LoadInstrument(Workspace=dataFile, InstrumentName="POLDI", OverwriteSpectraMap=True)
 
     def runPoldiMerge(self, workspaceNames, outputWorkspaceName):
         PoldiMerge(WorkspaceNames=workspaceNames, OutputWorkspace=outputWorkspaceName)
diff --git a/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py b/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py
index 1d72dcab9abbc836e45313cfae43ed925fc1cb78..17db3b4f96ba79839c41a37cca5c4120767a3ce3 100644
--- a/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py
@@ -17,7 +17,7 @@ class POLDITruncateDataTest(stresstesting.MantidStressTest):
 
     def loadDataFiles(self,):
         LoadSINQFile(Instrument='POLDI',Filename=self.dataFileName + ".hdf",OutputWorkspace=self.dataFileName)
-        LoadInstrument(Workspace=self.dataFileName, InstrumentName="POLDI")
+        LoadInstrument(Workspace=self.dataFileName, InstrumentName="POLDI", OverwriteSpectraMap=True)
 
     def workingAnalysis(self):
     # In this method the "normal behavior" is tested, if everything is
diff --git a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
index d9bc20ec5fbb023f5433c2b56c7d7d30dc6f7a11..87a2ab193efba2b7916c1bbce374d345ca370291 100644
--- a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
+++ b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
@@ -831,7 +831,7 @@ class Peak2ConvCell_Test(object):#(stresstesting.MantidStressTest):
         CreateSingleValuedWorkspace(OutputWorkspace="Sws",DataValue="3")
 
         CreateSingleValuedWorkspace(OutputWorkspace="Temp",DataValue="3")
-        LoadInstrument(Workspace="Sws",InstrumentName="TOPAZ")
+        LoadInstrument(Workspace="Sws",InstrumentName="TOPAZ", OverwriteSpectraMap=True)
         Inst= mtd["Sws"].getInstrument()
         startA = 2
         side1Ratios =[1.0, 1.2,  3.0,  8.0]