diff --git a/Code/Mantid/Framework/API/test/CompositeFunctionTest.h b/Code/Mantid/Framework/API/test/CompositeFunctionTest.h
index 906de03470fff27e66abd78536d1b38f1d68707e..0099d7ea62cf8cd69953ba37e5f9bbf3f0e997a6 100644
--- a/Code/Mantid/Framework/API/test/CompositeFunctionTest.h
+++ b/Code/Mantid/Framework/API/test/CompositeFunctionTest.h
@@ -1285,8 +1285,6 @@ public:
     mfun->addFunction(bk);
     mfun->addFunction(g1);
 
-    //FrameworkManager::Instance();
-    //MatrixWorkspace_sptr ws = WorkspaceFactory::Instance().create("Workspace2D",10,11,10);
     MatrixWorkspace_sptr ws(new CompositeFunctionTest_MocMatrixWorkspace(10,11,10));
 
     MantidVec& x = ws->dataX(3);
diff --git a/Code/Mantid/Framework/API/test/FunctionTest.h b/Code/Mantid/Framework/API/test/FunctionTest.h
index 7eab301f7889ded948ee745c8d0b13ef6df17e4c..e2b399e7aa78413f661ac5a5c3b24608ea8343f9 100644
--- a/Code/Mantid/Framework/API/test/FunctionTest.h
+++ b/Code/Mantid/Framework/API/test/FunctionTest.h
@@ -490,8 +490,6 @@ public:
 
   void test_setWorkspace_works()
   {
-    //FrameworkManager::Instance();
-    //MatrixWorkspace_sptr ws = WorkspaceFactory::Instance().create("Workspace2D",10,11,10);
     MatrixWorkspace_sptr ws(new MocMatrixWorkspace(10,11,10));
 
     MantidVec& x = ws->dataX(3);
@@ -515,7 +513,6 @@ public:
   {
     double expected;
     int numpixels = 15000;
-    //MatrixWorkspace_sptr ws = WorkspaceFactory::Instance().create("Workspace2D",numpixels,11,10);
     MatrixWorkspace_sptr ws(new MocMatrixWorkspace(numpixels,11,10));
     for (size_t wi=0; wi<ws->getNumberHistograms(); wi++)
     {
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/EditTOFPowderDiffractomerGeometry.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/EditTOFPowderDiffractomerGeometry.h
index 82afd10922f566a8772051e9de18bd587ffffdeb..778f5126d0fe6e2f4c2f9ace60e0f2a7bf15c8b3 100644
--- a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/EditTOFPowderDiffractomerGeometry.h
+++ b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/EditTOFPowderDiffractomerGeometry.h
@@ -40,6 +40,8 @@ namespace Algorithms
     EditTOFPowderDiffractomerGeometry();
     ~EditTOFPowderDiffractomerGeometry();
     virtual const std::string name() const { return "EditTOFPowderDiffractomerGeometry"; }
+    /// Algorithm's category for identification overriding a virtual method
+    virtual const std::string category() const { return "Diffraction";}
     /// Algorithm's version for identification overriding a virtual method
     virtual int version() const { return 1; }
     
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CenterpieceRebinning.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CenterpieceRebinning.h
index f4f401cdcfbbf3844d7a87c988320e0938fadbe3..e233c0668c02998c74173407272188450da70afd 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CenterpieceRebinning.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/CenterpieceRebinning.h
@@ -61,7 +61,7 @@ public:
       /// Algorithm's version for identification overriding a virtual method
       virtual int version() const { return 1;}
       /// Algorithm's category for identification overriding a virtual method
-      virtual const std::string category() const { return "MD-Algorithms";}
+      virtual const std::string category() const { return "MDAlgorithms";}
 
 
      /** set up Target geometry description to describe the input workspace e.g. the rebinning would be
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Load_MDWorkspace.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Load_MDWorkspace.h
index 8f6c8395f3c2be7ba2dd05e96ec7b5fb09f260f1..0134e7be2a11d8c0a41e1cb3d069ffecdae7f7ab 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Load_MDWorkspace.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Load_MDWorkspace.h
@@ -60,7 +60,7 @@ public:
       /// Algorithm's version for identification overriding a virtual method
       virtual int version() const { return 1;}
       /// Algorithm's category for identification overriding a virtual method
-      virtual const std::string category() const { return "MD-Algorithms";}
+      virtual const std::string category() const { return "MDAlgorithms";}
      /** The function sets load algorithm into test mode, namely it conects the algorithm to the test file reader,
 	     which provides test workspace (generated and not from a data file)* The test mode is dropped immidiately after
 		 the algorithm has been executed, so if you need a test mode for next load operation, you should set it again */
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateMDD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateMDD.h
index 8e78c8ef19003665d7a126afa90e79d45365c503..9e7562806d964f42f5cc473a0a0c3e147a3a3dce 100644
--- a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateMDD.h
+++ b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/SimulateMDD.h
@@ -66,6 +66,8 @@ namespace Mantid
       ~SimulateMDD();
       /// Algorithm's name for identification overriding a virtual method
       virtual const std::string name() const { return "SimulateMDD";}
+      /// Algorithm's category for identification overriding a virtual method
+      virtual const std::string category() const { return "MDAlgorithms";}
       /// Algorithm's version for identification overriding a virtual method
       virtual int version() const { return (1);}
       // Method to actually evaluate the bg model with the given parameters