diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
index 3561ae64b0da0b9415b8b2048a042657269aa032..0673607c663537f02ef0317b91186fedca4e9468 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CreateMDWorkspace.h
@@ -40,7 +40,7 @@ namespace MDAlgorithms
     void exec();
 
     template<typename MDE, size_t nd>
-    void finish(typename MDEventWorkspace<MDE, nd>::sptr ws);
+    void finish(typename MDEvents::MDEventWorkspace<MDE, nd>::sptr ws);
 
 
   };
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
index 0209f202a2ccb87b955b5da126e0093cca9a0723..2ca772b365a10c55c36f482117683c2b2ece5e90 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDHistoWorkspace.cpp
@@ -37,6 +37,7 @@ A very similar algorithm to this is [[ImportMDHistoWorkspace]], which takes it's
 
 using namespace Mantid::Kernel;
 using namespace Mantid::API;
+using namespace Mantid::MDEvents;
 
 namespace Mantid
 {
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
index 0766e761d7330b63996c5ee9c459039000a7f6d8..7badb5c53b0c85602a0b5757cb46833f041a08c1 100644
--- a/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
+++ b/Code/Mantid/Framework/MDAlgorithms/src/CreateMDWorkspace.cpp
@@ -34,6 +34,7 @@ namespace MDAlgorithms
   using namespace Mantid::Kernel;
   using namespace Mantid::API;
   using namespace Mantid::Geometry;
+  using namespace Mantid::MDEvents;
 
   // Register the algorithm into the AlgorithmFactory
   DECLARE_ALGORITHM(CreateMDWorkspace)
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
index 18de101bd91f572957acab7dd71d3f52ab0e4c1e..e678d35b22a8f996961c025651f0b4088075b7c1 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDHistoWorkspaceTest.h
@@ -11,6 +11,7 @@
 
 using namespace Mantid;
 using namespace Mantid::MDEvents;
+using namespace Mantid::MDAlgorithms;
 using namespace Mantid::API;
 
 class CreateMDHistoWorkspaceTest : public CxxTest::TestSuite
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
index b86a3931e288542c6f370ccd45826637fbc9084b..4394857a23bb35d856bba62ea60ec3098dcc78c9 100644
--- a/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
+++ b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
@@ -13,9 +13,10 @@
 #include <iostream>
 #include <Poco/File.h>
 
-using namespace Mantid::MDEvents;
 using namespace Mantid::API;
 using namespace Mantid::Geometry;
+using namespace Mantid::MDEvents;
+using namespace Mantid::MDAlgorithms;
 
 class CreateMDWorkspaceTest : public CxxTest::TestSuite
 {
diff --git a/Code/Mantid/Framework/MDEvents/test/MDEventInserterTest.h b/Code/Mantid/Framework/MDEvents/test/MDEventInserterTest.h
index 55c24ed174b58472517e32007104a0f8b54dec8f..65e648eea7774482a9c8cc4b66dbfadc9581583a 100644
--- a/Code/Mantid/Framework/MDEvents/test/MDEventInserterTest.h
+++ b/Code/Mantid/Framework/MDEvents/test/MDEventInserterTest.h
@@ -7,9 +7,9 @@
 #include "MantidAPI/FrameworkManager.h"
 #include "MantidAPI/AnalysisDataService.h"
 #include "MantidAPI/IMDEventWorkspace.h"
+#include "MantidAPI/IAlgorithm.h"
 #include "MantidMDEvents/MDEventWorkspace.h"
 #include "MantidMDEvents/MDEvent.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
 #include <iostream>
 #include <iomanip>
 
@@ -36,16 +36,16 @@ private:
     {
       ADS.remove(outWSName);
     }
-
-    CreateMDWorkspace createAlg;
-    createAlg.initialize();
-    createAlg.setProperty("Dimensions", 2);
-    createAlg.setPropertyValue("Extents", "-10,10,-10,10");
-    createAlg.setPropertyValue("Names", "A, B");
-    createAlg.setPropertyValue("Units", "m, m");
-    createAlg.setPropertyValue("EventType", eventType);
-    createAlg.setPropertyValue("OutputWorkspace", outWSName);
-    createAlg.execute();
+    
+    IAlgorithm* createAlg = FrameworkManager::Instance().createAlgorithm("CreateMDWorkspace");
+    createAlg->initialize();
+    createAlg->setProperty("Dimensions", 2);
+    createAlg->setPropertyValue("Extents", "-10,10,-10,10");
+    createAlg->setPropertyValue("Names", "A, B");
+    createAlg->setPropertyValue("Units", "m, m");
+    createAlg->setPropertyValue("EventType", eventType);
+    createAlg->setPropertyValue("OutputWorkspace", outWSName);
+    createAlg->execute();
 
     return ADS.retrieveWS<IMDEventWorkspace>(outWSName);
   }
diff --git a/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h b/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h
index 27cb718fbe84a2841da6a237c44f55243e80efec..c0abd915bd64f7e6388c20eb7ee14dd8d97b70d9 100644
--- a/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h
+++ b/Code/Mantid/Framework/MDEvents/test/MDEventWorkspaceTest.h
@@ -15,7 +15,7 @@
 #include "MantidMDEvents/MDEventWorkspace.h"
 #include "MantidMDEvents/MDGridBox.h"
 #include "MantidMDEvents/MDLeanEvent.h"
-#include "MantidMDEvents/CreateMDWorkspace.h"
+//#include "MantidMDEvents/CreateMDWorkspace.h"
 #include "MantidTestHelpers/MDEventsTestHelper.h"
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/mersenne_twister.hpp>
diff --git a/Code/Mantid/Vates/VatesAPI/test/MockObjects.h b/Code/Mantid/Vates/VatesAPI/test/MockObjects.h
index aab894c8a1ecdea81fc331d86f7164928e79f8fc..9f17781b7249a1483093aefdb6e1682263f704e7 100644
--- a/Code/Mantid/Vates/VatesAPI/test/MockObjects.h
+++ b/Code/Mantid/Vates/VatesAPI/test/MockObjects.h
@@ -1,7 +1,7 @@
 #ifndef VATESAPI_TEST_MOCKOBJECTS_H
 #define VATESAPI_TEST_MOCKOBJECTS_H
 
-#include "MantidMDEvents/CreateMDWorkspace.h"
+//#include "MantidMDAlgorithms/CreateMDWorkspace.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidAPI/IMDIterator.h"
 #include "MantidAPI/IMDWorkspace.h"
@@ -22,6 +22,7 @@
 #include "MantidVatesAPI/RebinningCutterXMLDefinitions.h"
 #include "MantidVatesAPI/WorkspaceProvider.h"
 #include "MantidAPI/NullCoordTransform.h"
+#include "MantidAPI/FrameworkManager.h"
 #include <gmock/gmock.h>
 #include <vtkFieldData.h>
 #include <vtkCharArray.h>
@@ -316,14 +317,15 @@ class FakeProgressAction : public Mantid::VATES::ProgressAction
   {
     using namespace Mantid::API;
     AnalysisDataService::Instance().remove("3D_Workspace");
-    Mantid::MDEvents::CreateMDWorkspace create;
-    create.initialize();
-    create.setProperty("Dimensions", 4);
-    create.setPropertyValue("Extents","0,5,0,5,0,5,0,5");
-    create.setPropertyValue("Names","A,B,C,D");
-    create.setPropertyValue("Units","A,A,A,A");
-    create.setPropertyValue("OutputWorkspace", "3D_Workspace");
-    create.execute();
+    IAlgorithm* create = FrameworkManager::Instance().createAlgorithm("CreateMDWorkspace");
+
+    create->initialize();
+    create->setProperty("Dimensions", 4);
+    create->setPropertyValue("Extents","0,5,0,5,0,5,0,5");
+    create->setPropertyValue("Names","A,B,C,D");
+    create->setPropertyValue("Units","A,A,A,A");
+    create->setPropertyValue("OutputWorkspace", "3D_Workspace");
+    create->execute();
     return AnalysisDataService::Instance().retrieve("3D_Workspace");
   }