diff --git a/qt/python/CMakeLists.txt b/qt/python/CMakeLists.txt
index 5769c77d3d21fd48eae3c12d23fdec1c543df931..a14598f0b5a6c02a5f80d0f5a061db9daf9fb205 100644
--- a/qt/python/CMakeLists.txt
+++ b/qt/python/CMakeLists.txt
@@ -57,7 +57,7 @@ set ( SIP_HDRS
   ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h
   ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h
   ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h
-  ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
+  ../widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
   ../widgets/common/inc/MantidQtWidgets/Common/SlitCalculator.h
   ../widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetTab.h
   ../widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidget.h
diff --git a/qt/python/mantidqt.sip b/qt/python/mantidqt.sip
index 218110d4316b9945ae660ea8d5d34ca94142b00d..93d5a928f07c7c8408b786a05b30112daeffc491 100644
--- a/qt/python/mantidqt.sip
+++ b/qt/python/mantidqt.sip
@@ -1980,13 +1980,13 @@ SeparatorCommand();
 SeparatorCommand(const MantidQt::MantidWidgets::DataProcessor::SeparatorCommand &);
 };
 
-class DataProcessorWorkspaceCommand
+class WorkspaceCommand
 {
 %TypeHeaderCode
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h"
 %End
 public:
-DataProcessorWorkspaceCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &, const QString &);
+WorkspaceCommand(const MantidQt::MantidWidgets::DataProcessor::QDataProcessorWidget &, const QString &);
 void execute();
 QString name();
 QString icon();
@@ -1995,8 +1995,8 @@ QString whatsthis();
 QString shortcut();
 
 private:
-DataProcessorWorkspaceCommand();
-DataProcessorWorkspaceCommand(const MantidQt::MantidWidgets::DataProcessor::DataProcessorWorkspaceCommand &);
+WorkspaceCommand();
+WorkspaceCommand(const MantidQt::MantidWidgets::DataProcessor::WorkspaceCommand &);
 };
 
 }; // end namespace DataProcessor
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index f7b766f7d08a1d77ab1399abac0ccf9d3eac90a4..d276afb24b5da04d39a66d0f573fa58ca506c937 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -341,7 +341,7 @@ set ( INC_FILES
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorVectorString.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWhiteList.h
-	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
+	inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterFactory.h
 	inc/MantidQtWidgets/Common/ParseKeyValueString.h
 	inc/MantidQtWidgets/Common/ParseNumerics.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
similarity index 84%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
index 03e5ab6fb851fb2454a12fbb5b0e79691e0c59c0..eb4c41941166fe279b943c9c7ddbefa3fbc92542 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h
@@ -6,9 +6,9 @@
 namespace MantidQt {
 namespace MantidWidgets {
 namespace DataProcessor {
-/** @class DataProcessorWorkspaceCommand
+/** @class WorkspaceCommand
 
-DataProcessorWorkspaceCommand defines a workspace action
+WorkspaceCommand defines a workspace action
 
 Copyright © 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
 National Laboratory & European Spallation Source
@@ -31,15 +31,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 File change history is stored at: <https://github.com/mantidproject/mantid>.
 Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
-class DataProcessorWorkspaceCommand : public CommandBase {
+class WorkspaceCommand : public CommandBase {
 public:
-  DataProcessorWorkspaceCommand(DataProcessorPresenter *tablePresenter,
+  WorkspaceCommand(DataProcessorPresenter *tablePresenter,
                                 const QString &name)
       : CommandBase(tablePresenter), m_name(name){};
-  DataProcessorWorkspaceCommand(const QDataProcessorWidget &widget,
+  WorkspaceCommand(const QDataProcessorWidget &widget,
                                 const QString &name)
       : CommandBase(widget), m_name(name){};
-  virtual ~DataProcessorWorkspaceCommand(){};
+  virtual ~WorkspaceCommand(){};
 
   void execute() override {
     // Tell the presenter which of the available workspaces was selected
diff --git a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
index cffa106507ee01914e865d097fcea04807228039..87be62cc039e4042f17c8dba8b0c3458cd227d88 100644
--- a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
@@ -14,7 +14,7 @@
 #include "MantidQtWidgets/Common/AlgorithmHintStrategy.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/GenerateNotebook.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterGroupReducerWorker.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h"
@@ -1662,7 +1662,7 @@ GenericDataProcessorPresenter::getTableList() {
   // Create a command for each of the workspaces in the ADS
   for (const auto &name : m_workspaceList) {
     workspaces.push_back(
-        Mantid::Kernel::make_unique<DataProcessorWorkspaceCommand>(this, name));
+        Mantid::Kernel::make_unique<WorkspaceCommand>(this, name));
   }
   return workspaces;
 }
diff --git a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
index f10793249d84cf8279d0d1ec7b359d65c327fbcd..5ce65b6e9ec8b02076805bb889dc51ef53431c9c 100644
--- a/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/CommandsTest.h
@@ -32,7 +32,7 @@
 #include "MantidQtWidgets/Common/DataProcessorUI/SaveTableAsCommand.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/SaveTableCommand.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/SeparatorCommand.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/WorkspaceCommand.h"
 
 using namespace MantidQt::MantidWidgets;
 using namespace MantidQt::MantidWidgets::DataProcessor;
@@ -371,7 +371,7 @@ public:
 
   void test_workspace_command() {
     NiceMock<MockDataProcessorPresenter> mockPresenter;
-    DataProcessorWorkspaceCommand command(&mockPresenter, "workspace");
+    WorkspaceCommand command(&mockPresenter, "workspace");
 
     // The presenter should set the name of the ws
     EXPECT_CALL(mockPresenter, setModel(QString("workspace")))
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index fdd20dd8422f7b14204d77500d7071f5492795f6..c9f9d40deb5a0c448ee02f145efe53e0d811099e 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -196,7 +196,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
             submenu.setIcon(QtGui.QIcon(command.icon()))
 
             for ws in workspace_list:
-                ws_command = MantidQt.MantidWidgets.DataProcessorWorkspaceCommand(self.data_processor_table, ws)
+                ws_command = MantidQt.MantidWidgets.WorkspaceCommand(self.data_processor_table, ws)
                 action = QtGui.QAction(QtGui.QIcon(ws_command.icon()), ws_command.name(), self)
                 action.triggered.connect(lambda: self._connect_action(ws_command))
                 submenu.addAction(action)
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index ca0f9b0f48420f8df594c76bb7f542d6f672f1d8..1c1020f9b500829cb919253c559f7764827f8c9d 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -191,7 +191,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
             submenu.setIcon(QtGui.QIcon(command.icon()))
 
             for ws in workspace_list:
-                ws_command = MantidQt.MantidWidgets.DataProcessorWorkspaceCommand(self.data_processor_table, ws)
+                ws_command = MantidQt.MantidWidgets.WorkspaceCommand(self.data_processor_table, ws)
                 action = QtGui.QAction(QtGui.QIcon(ws_command.icon()), ws_command.name(), self)
                 action.triggered.connect(lambda: self._connect_action(ws_command))
                 submenu.addAction(action)
diff --git a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
index b2c14ff0605101a4d8cfdbcb5e18146a4403c5e7..877982c4990e081f405bf85290d96563767688c7 100644
--- a/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
+++ b/scripts/Interface/ui/sans_isis/sans_data_processor_gui.py
@@ -1510,7 +1510,7 @@ class SANSDataProcessorGui(QtGui.QMainWindow, ui_sans_data_processor_window.Ui_S
             submenu.setIcon(QtGui.QIcon(command.icon()))
 
             for ws in workspace_list:
-                ws_command = MantidQt.MantidWidgets.DataProcessorWorkspaceCommand(self.data_processor_table, ws)
+                ws_command = MantidQt.MantidWidgets.WorkspaceCommand(self.data_processor_table, ws)
                 action = QtGui.QAction(QtGui.QIcon(ws_command.icon()), ws_command.name(), self)
                 action.triggered.connect(lambda: self._connect_action(ws_command))
                 submenu.addAction(action)