diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
index b42de31c9a06a523226834fad4ba401d54b6d482..77ab22736f813a118c57779db46630351406b1c0 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/MDEWRebinningCutterOperator/vtkMDEWRebinningCutter.cxx
@@ -19,13 +19,13 @@
 #include "MantidGeometry/MDGeometry/IMDDimensionFactory.h"
 #include "MantidVatesAPI/EscalatingRebinningActionManager.h"
 #include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
 #include "MantidVatesAPI/vtkMDLineFactory.h"
 #include "MantidVatesAPI/vtkMDQuadFactory.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
 #include "MantidVatesAPI/TimeToTimeStep.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/Common.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
index c5baea6a88bdba7d344dd49e56ae3ec6b332cdc3..1e4217fb2d9b6bc28b651a215e2d12ed808ab3aa 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewFilters/RebinningTransformOperator/vtkRebinningTransformOperator.cxx
@@ -20,11 +20,11 @@
 #include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
 #include "MantidVatesAPI/vtkMDQuadFactory.h"
 #include "MantidVatesAPI/vtkMDLineFactory.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
 #include "MantidVatesAPI/TimeToTimeStep.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/Common.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
index a6ad53e1e2d3d7c4915a9c53ee37fe93d42f7b0d..fd6cf3f3552a4d523a44587ea1457eb8bd9b99ed 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/EventNexusReader/vtkEventNexusReader.cxx
@@ -13,7 +13,7 @@
 #include "vtkBox.h"
 #include "vtkUnstructuredGrid.h"
 
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
 #include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
index ae1eae3676a7c0c9981d0b01d749461072330b3b..0c8cefba21fbcaac74e4c695197d583afc3cda49 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDEWNexusReader/vtkMDEWNexusReader.cxx
@@ -13,7 +13,7 @@
 #include "vtkBox.h"
 #include "vtkUnstructuredGrid.h"
 
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
 #include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
index d5bb132fd12fe5e024072cc05b542101884cb9ea..a793157ba7e8e4d14ceaf5cfac54263344f2f551 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/SQWEventReader/vtkSQWEventReader.cxx
@@ -13,7 +13,7 @@
 #include "vtkPVClipDataSet.h"
 #include "vtkBox.h"
 
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
 #include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
index 468d0b7dee460c4debe022f24cd27bd051f3529b..60a0ca5e2285052a14ab9599685fec803c35dd54 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.cxx
@@ -11,7 +11,7 @@
 #include "MantidVatesAPI/MDEWInMemoryLoadingPresenter.h"
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
 #include "MantidVatesAPI/ADSWorkspaceProvider.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
 
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
index 4677aebc07196a66a0659981c13f20bd1d89334b..74fae2b603e694995e0cc78817a77206bdbe3ebe 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
@@ -12,8 +12,8 @@
 #include "MantidVatesAPI/MDLoadingViewAdapter.h"
 #include "MantidVatesAPI/ADSWorkspaceProvider.h"
 #include "MantidVatesAPI/TimeToTimeStep.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
 #include "MantidVatesAPI/FilteringUpdateProgressAction.h"
 #include "MantidVatesAPI/IgnoreZerosThresholdRange.h"
 
diff --git a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
index e97cc0e4064c2645aa62d68fb228a4690611bd57..a6b680e2ef850bf649c82428a78368d8241129f9 100644
--- a/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
+++ b/Code/Mantid/Vates/VatesAPI/CMakeLists.txt
@@ -38,12 +38,12 @@ src/vtkDataSetToWsLocation.cpp
 src/vtkMDLineFactory.cpp
 src/vtkMDQuadFactory.cpp
 src/vtkSplatterPlotFactory.cpp
-src/vtkMDEWHexahedronFactory.cpp
+src/vtkMDHexFactory.cpp
 src/vtkPeakMarkerFactory.cpp
-src/vtkThresholdingHexahedronFactory.cpp
-src/vtkThresholdingLineFactory.cpp
-src/vtkThresholdingQuadFactory.cpp
-src/vtkThresholdingUnstructuredGridFactory.cpp
+src/vtkMDHistoHexFactory.cpp
+src/vtkMDHistoLineFactory.cpp
+src/vtkMDHistoQuadFactory.cpp
+src/vtkMDHistoHex4DFactory.cpp
 src/SQWLoadingPresenter.cpp
 )
 
@@ -95,13 +95,13 @@ inc/MantidVatesAPI/vtkDataSetToWsName.h
 inc/MantidVatesAPI/vtkDataSetToWsLocation.h
 inc/MantidVatesAPI/vtkMDLineFactory.h
 inc/MantidVatesAPI/vtkMDQuadFactory.h
-inc/MantidVatesAPI/vtkMDEWHexahedronFactory.h
+inc/MantidVatesAPI/vtkMDHexFactory.h
 inc/MantidVatesAPI/vtkSplatterPlotFactory.h
 inc/MantidVatesAPI/vtkPeakMarkerFactory.h
-inc/MantidVatesAPI/vtkThresholdingHexahedronFactory.h
-inc/MantidVatesAPI/vtkThresholdingLineFactory.h
-inc/MantidVatesAPI/vtkThresholdingQuadFactory.h
-inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h
+inc/MantidVatesAPI/vtkMDHistoHexFactory.h
+inc/MantidVatesAPI/vtkMDHistoLineFactory.h
+inc/MantidVatesAPI/vtkMDHistoQuadFactory.h
+inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
 inc/MantidVatesAPI/WorkspaceProvider.h
 )
 
@@ -117,13 +117,13 @@ test/vtkDataSetFactoryTest.h
 test/vtkDataSetToGeometryTest.h
 test/vtkMDLineFactoryTest.h
 test/vtkMDQuadFactoryTest.h
-test/vtkMDEWHexahedronFactoryTest.h
+test/vtkMDHexFactoryTest.h
 test/vtkSplatterPlotFactoryTest.h
 test/vtkPeakMarkerFactoryTest.h
-test/vtkThresholdingUnstructuredGridFactoryTest.h
-test/vtkThresholdingHexahedronFactoryTest.h
-test/vtkThresholdingLineFactoryTest.h
-test/vtkThresholdingQuadFactoryTest.h
+test/vtkMDHistoHex4DFactoryTest.h
+test/vtkMDHistoHexFactoryTest.h
+test/vtkMDHistoLineFactoryTest.h
+test/vtkMDHistoQuadFactoryTest.h
 test/FieldDataToMetadataTest.h
 test/FilteringUpdateProgressActionTest.h
 test/MDLoadingViewAdapterTest.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDEWHexahedronFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHexFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDEWHexahedronFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHexFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
similarity index 97%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
index 4b3f08dd7070865dfc286e8e6268d39c52443c1f..f8e6c3461daca84445f48fc63458ad3f889bb15c 100644
--- a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h
+++ b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHex4DFactory.h
@@ -31,7 +31,7 @@
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidVatesAPI/ThresholdRange.h"
 #include "MantidVatesAPI/vtkDataSetFactory.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
 #include <vtkCellData.h>
 #include <vtkFloatArray.h>
 #include <vtkHexahedron.h>
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingHexahedronFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHexFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingHexahedronFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoHexFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingLineFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoLineFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingLineFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoLineFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingQuadFactory.h b/Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoQuadFactory.h
similarity index 100%
rename from Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkThresholdingQuadFactory.h
rename to Code/Mantid/Vates/VatesAPI/inc/MantidVatesAPI/vtkMDHistoQuadFactory.h
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp
index acc30e4aac2fb81aac7f82146880734d8e4a7e52..3747afb9d982e1cfc44e7b5e884e4b9282a1d0a1 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkMDEWHexahedronFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHexFactory.cpp
@@ -1,7 +1,7 @@
 #include "MantidAPI/IMDEventWorkspace.h"
 #include "MantidKernel/CPUTimer.h"
 #include "MantidMDEvents/MDEventFactory.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <vtkCellData.h>
 #include <vtkFloatArray.h>
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingUnstructuredGridFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHex4DFactory.cpp
similarity index 95%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingUnstructuredGridFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHex4DFactory.cpp
index ce8e579eee8e9cca1893ebe1231112a4516cb38f..968091af7fe54dd107b9dd0228e8cf0837524960 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingUnstructuredGridFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHex4DFactory.cpp
@@ -3,7 +3,7 @@
 #include "MantidMDEvents/MDHistoWorkspace.h"
 #include "MantidVatesAPI/TimeStepToTimeStep.h"
 #include "MantidVatesAPI/TimeToTimeStep.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
 #include <boost/math/special_functions/fpclassify.hpp>
 
 using Mantid::API::IMDWorkspace;
@@ -24,7 +24,7 @@ namespace VATES
 
     /**
   Assigment operator
-  @param other : vtkThresholdingHexahedronFactory to assign to this instance from.
+  @param other : vtkMDHistoHex4DFactory to assign to this instance from.
   @return ref to assigned current instance.
   */
   template<typename TimeMapper>
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHexFactory.cpp
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHexFactory.cpp
index c1e49f5b5cc7c8bdd2ec249d67f1b90844958fe3..973e9779bc8dae4af80d396fed34b278a8a51bc4 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingHexahedronFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoHexFactory.cpp
@@ -1,7 +1,7 @@
 #include "MantidAPI/IMDWorkspace.h"
 #include "MantidKernel/CPUTimer.h"
 #include "MantidMDEvents/MDHistoWorkspace.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <vtkImageData.h>
 #include <vtkRectilinearGrid.h>
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingLineFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp
similarity index 98%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingLineFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp
index 231d184b309043d033adef58acdb19fed6665b8f..43c76660df0d6b5150843c5d2f0a782d001e9665 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingLineFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoLineFactory.cpp
@@ -1,4 +1,4 @@
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
 #include "vtkCellArray.h"
 #include "vtkCellData.h"
 #include "vtkFloatArray.h"
diff --git a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingQuadFactory.cpp b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/src/vtkThresholdingQuadFactory.cpp
rename to Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
index 4d1a66234c0d730dd30dad2652cd3341282e55ac..48c31454d9a0e4e976effa395b67066ffa3d578d 100644
--- a/Code/Mantid/Vates/VatesAPI/src/vtkThresholdingQuadFactory.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/vtkMDHistoQuadFactory.cpp
@@ -2,7 +2,7 @@
 #include "MantidKernel/CPUTimer.h"
 #include "MantidMDEvents/MDHistoWorkspace.h"
 #include "MantidAPI/NullCoordTransform.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
 #include "vtkCellArray.h"
 #include "vtkCellData.h"
 #include "vtkFloatArray.h"
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkMDEWHexahedronFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkMDEWHexahedronFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h
index 54ac18cfb1b62e9e8a25402ae62a1b5d10a3f732..43c8e79ee2f81c5968c8d8f26203036bad7e5ee7 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkMDEWHexahedronFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHexFactoryTest.h
@@ -9,7 +9,7 @@
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkMDEWHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHexFactory.h"
 #include "MantidVatesAPI/NoThresholdRange.h"
 #include "MockObjects.h"
 #include <cxxtest/TestSuite.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingUnstructuredGridFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingUnstructuredGridFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h
index 6e7ba82ab07cae4b088aba4071709abd192a5ed9..4e4134c201cd07c8dcfa009e9fb3848ca3a18001 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingUnstructuredGridFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHex4DFactoryTest.h
@@ -6,7 +6,7 @@
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include "MantidVatesAPI/TimeStepToTimeStep.h"
 #include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingUnstructuredGridFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHex4DFactory.h"
 #include "MockObjects.h"
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingHexahedronFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingHexahedronFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h
index 2b5a5a6991c72edb14090d656a3d4cf05d097c1b..bcb88b33521669239f97d208cfa1e5876b69e59c 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingHexahedronFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoHexFactoryTest.h
@@ -4,7 +4,7 @@
 #include "MantidMDEvents/MDHistoWorkspace.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingHexahedronFactory.h"
+#include "MantidVatesAPI/vtkMDHistoHexFactory.h"
 #include "MockObjects.h"
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingLineFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingLineFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h
index 424646ae677abb2f653d319557a56ddf2a39a603..7dbcd1751f78aff965f4139d5be02d4efff79d17 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingLineFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoLineFactoryTest.h
@@ -4,7 +4,7 @@
 #include "MantidAPI/IMDIterator.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingLineFactory.h"
+#include "MantidVatesAPI/vtkMDHistoLineFactory.h"
 #include "MockObjects.h"
 #include <cxxtest/TestSuite.h>
 #include <gmock/gmock.h>
diff --git a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingQuadFactoryTest.h b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h
similarity index 99%
rename from Code/Mantid/Vates/VatesAPI/test/vtkThresholdingQuadFactoryTest.h
rename to Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h
index 0e8a08c9e8d08942332106f111f18f6af3aa7878..9a5789ec10b727b45ce33efa694fa79474673c0c 100644
--- a/Code/Mantid/Vates/VatesAPI/test/vtkThresholdingQuadFactoryTest.h
+++ b/Code/Mantid/Vates/VatesAPI/test/vtkMDHistoQuadFactoryTest.h
@@ -4,7 +4,7 @@
 #include "MantidAPI/IMDIterator.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include "MantidVatesAPI/UserDefinedThresholdRange.h"
-#include "MantidVatesAPI/vtkThresholdingQuadFactory.h"
+#include "MantidVatesAPI/vtkMDHistoQuadFactory.h"
 #include "MockObjects.h"
 #include <cxxtest/TestSuite.h>
 #include <vtkStructuredGrid.h>