diff --git a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
index a00e39320ac7ce47e3963021ca6304dd3f1d9fb7..725d127a6def28aeb15268d65f1c32a6627f4b41 100644
--- a/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/IReflRunsTabView.h
@@ -9,7 +9,7 @@ namespace MantidQt {
 
 namespace MantidWidgets {
 namespace DataProcessor {
-class DataProcessorCommand;
+class Command;
 }
 }
 namespace API {
@@ -62,9 +62,9 @@ public:
                                  const std::string &defaultInstrument) = 0;
   virtual void setTransferMethods(const std::set<std::string> &methods) = 0;
   virtual void setTableCommands(
-      std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> tableCommands) = 0;
+      std::vector<std::unique_ptr<DataProcessor::Command>> tableCommands) = 0;
   virtual void setRowCommands(
-      std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> rowCommands) = 0;
+      std::vector<std::unique_ptr<DataProcessor::Command>> rowCommands) = 0;
   virtual void setAllSearchRowsSelected() = 0;
   virtual void clearCommands() = 0;
   virtual void setRowActionEnabled(int index, bool enabled) = 0;
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
index 372cfb16f1cb5eb7cd7d0e85b8af60faceeb1050..1fad565649f2faae42929168ffb7b3651aaf5e7a 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.cpp
@@ -8,7 +8,7 @@
 #include "ReflGenericDataProcessorPresenterFactory.h"
 #include "ReflRunsTabPresenter.h"
 #include "ReflSearchModel.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandAdapter.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
 #include "MantidQtWidgets/Common/HintingLineEditFactory.h"
@@ -114,9 +114,9 @@ void QtReflRunsTabView::initLayout() {
 * @param command : [input] The command (action) to add
 */
 void QtReflRunsTabView::addToMenu(QMenu *menu,
-                                  DataProcessor::DataProcessorCommand_uptr command) {
+                                  DataProcessor::Command_uptr command) {
 
-  m_commands.push_back(Mantid::Kernel::make_unique<DataProcessorCommandAdapter>(
+  m_commands.push_back(Mantid::Kernel::make_unique<CommandAdapter>(
       menu, std::move(command)));
 }
 
@@ -126,7 +126,7 @@ void QtReflRunsTabView::addToMenu(QMenu *menu,
 * "Reflectometry" menu
 */
 void QtReflRunsTabView::setTableCommands(
-    std::vector<DataProcessor::DataProcessorCommand_uptr> tableCommands) {
+    std::vector<DataProcessor::Command_uptr> tableCommands) {
 
   ui.menuTable->clear();
   for (auto &command : tableCommands) {
@@ -145,7 +145,7 @@ void QtReflRunsTabView::setTableCommands(
 * @param rowCommands : [input] The list of commands to add to the "Edit" menu
 */
 void QtReflRunsTabView::setRowCommands(
-    std::vector<DataProcessor::DataProcessorCommand_uptr> rowCommands) {
+    std::vector<DataProcessor::Command_uptr> rowCommands) {
 
   ui.menuRows->clear();
   for (auto &command : rowCommands) {
diff --git a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
index 5bea1d0f25f5b96e2dfe9bb96d44fc629967f738..ec9060c14f28e1e6257ac4c38cfccc61a5814c45 100644
--- a/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
+++ b/qt/scientific_interfaces/ISISReflectometry/QtReflRunsTabView.h
@@ -14,8 +14,8 @@ namespace MantidQt {
 namespace MantidWidgets {
 namespace DataProcessor {
 // Forward decs
-class DataProcessorCommand;
-class DataProcessorCommandAdapter;
+class Command;
+class CommandAdapter;
 }
 class SlitCalculator;
 }
@@ -73,10 +73,10 @@ public:
   void setInstrumentList(const std::vector<std::string> &instruments,
                          const std::string &defaultInstrument) override;
   void setTransferMethods(const std::set<std::string> &methods) override;
-  void setTableCommands(std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>>
+  void setTableCommands(std::vector<std::unique_ptr<DataProcessor::Command>>
                             tableCommands) override;
   void setRowCommands(
-      std::vector<std::unique_ptr<DataProcessor::DataProcessorCommand>> rowCommands) override;
+      std::vector<std::unique_ptr<DataProcessor::Command>> rowCommands) override;
   void setAllSearchRowsSelected() override;
   void clearCommands() override;
   void setRowActionEnabled(int index, bool enabled) override;
@@ -102,7 +102,7 @@ private:
   /// initialise the interface
   void initLayout();
   // Adds an action (command) to a menu
-  void addToMenu(QMenu *menu, std::unique_ptr<DataProcessor::DataProcessorCommand> command);
+  void addToMenu(QMenu *menu, std::unique_ptr<DataProcessor::Command> command);
 
   boost::shared_ptr<MantidQt::API::AlgorithmRunner> m_algoRunner;
 
@@ -115,7 +115,7 @@ private:
   // the slit calculator
   SlitCalculator *m_calculator;
   // Command adapters
-  std::vector<std::unique_ptr<DataProcessor::DataProcessorCommandAdapter>> m_commands;
+  std::vector<std::unique_ptr<DataProcessor::CommandAdapter>> m_commands;
 
 private slots:
   void on_actionSearch_triggered();
diff --git a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
index 4ae3875b7f1ffb852f4e8353d2ad2bff4d9c2b00..9ec597eb07cc910d21095203bd8454af0ccf7b9d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
+++ b/qt/scientific_interfaces/ISISReflectometry/ReflRunsTabPresenter.cpp
@@ -15,7 +15,7 @@
 #include "ReflNexusMeasurementItemSource.h"
 #include "ReflSearchModel.h"
 #include "ReflFromStdStringMap.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
 #include "MantidQtWidgets/Common/ProgressPresenter.h"
 
@@ -165,12 +165,12 @@ void ReflRunsTabPresenter::pushCommands() {
   const size_t rowCommStart = 10u;
   // We want to have two menus
   // Populate the "Reflectometry" menu
-  std::vector<MantidWidgets::DataProcessor::DataProcessorCommand_uptr> tableCommands;
+  std::vector<MantidWidgets::DataProcessor::Command_uptr> tableCommands;
   for (size_t i = 0; i < rowCommStart; i++)
     tableCommands.push_back(std::move(commands[i]));
   m_view->setTableCommands(std::move(tableCommands));
   // Populate the "Edit" menu
-  std::vector<MantidWidgets::DataProcessor::DataProcessorCommand_uptr> rowCommands;
+  std::vector<MantidWidgets::DataProcessor::Command_uptr> rowCommands;
   for (size_t i = rowCommStart; i < nCommands; i++)
     rowCommands.push_back(std::move(commands[i]));
   m_view->setRowCommands(std::move(rowCommands));
diff --git a/qt/scientific_interfaces/test/ReflMockObjects.h b/qt/scientific_interfaces/test/ReflMockObjects.h
index fb314302d178a944ab205c1e75682256240b7a6e..6ea009b0d080ec8b587c709c0b4ef3f024e6e2ad 100644
--- a/qt/scientific_interfaces/test/ReflMockObjects.h
+++ b/qt/scientific_interfaces/test/ReflMockObjects.h
@@ -17,7 +17,7 @@
 #include "../ISISReflectometry/IReflSettingsTabPresenter.h"
 #include "../ISISReflectometry/IReflSettingsView.h"
 #include "../ISISReflectometry/ReflSearchModel.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include <gmock/gmock.h>
 
 using namespace MantidQt::CustomInterfaces;
@@ -31,19 +31,19 @@ class MockRunsTabView : public IReflRunsTabView {
 public:
   // Gmock requires parameters and return values of mocked methods to be
   // copyable
-  // We can't mock setTableCommands(std::vector<DataProcessorCommand_uptr>)
+  // We can't mock setTableCommands(std::vector<Command_uptr>)
   // because
   // of the vector of unique pointers
   // I will mock a proxy method, setTableCommandsProxy, I just want to test that
   // this method is invoked by the presenter's constructor
   virtual void setTableCommands(
-      std::vector<MantidQt::MantidWidgets::DataProcessor::DataProcessorCommand_uptr>)
+      std::vector<MantidQt::MantidWidgets::DataProcessor::Command_uptr>)
       override {
     setTableCommandsProxy();
   }
   // The same happens for setRowCommands
   virtual void setRowCommands(
-      std::vector<MantidQt::MantidWidgets::DataProcessor::DataProcessorCommand_uptr>)
+      std::vector<MantidQt::MantidWidgets::DataProcessor::Command_uptr>)
       override {
     setRowCommandsProxy();
   }
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 5ee5125a0c3c938055a2b2eafb890946ff7ea2c3..6a47b7aca485647de0c368b899949b6857666fd4 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -184,7 +184,7 @@ set ( MOC_FILES
   inc/MantidQtWidgets/Common/CheckboxHeader.h
   inc/MantidQtWidgets/Common/ColorBarWidget.h
   inc/MantidQtWidgets/Common/DataProcessorUI/AbstractTreeModel.h
-  inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
+  inc/MantidQtWidgets/Common/DataProcessorUI/CommandAdapter.h
   inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
   inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterThread.h
   inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenterRowReducerWorker.h
@@ -305,8 +305,8 @@ set ( INC_FILES
 	inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
-	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
-	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
+	inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
+	inc/MantidQtWidgets/Common/DataProcessorUI/CommandBase.h
   inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
 	inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
@@ -440,7 +440,7 @@ set( TEST_FILES
    SignalBlockerTest.h
    AlgorithmHintStrategyTest.h
    TrackedActionTest.h
-   DataProcessorUI/DataProcessorCommandsTest.h
+   DataProcessorUI/CommandsTest.h
    DataProcessorUI/DataProcessorGenerateNotebookTest.h
    DataProcessorUI/DataProcessorOneLevelTreeManagerTest.h
    DataProcessorUI/DataProcessorPostprocessingAlgorithmTest.h
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
index 5df336d8454b2b02263c6f8a7db5ea067d7f5c8e..1c16e57a002379d4646d6381ff583938ad7ed026 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendGroupCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDGROUPCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDGROUPCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
 
 namespace MantidQt {
@@ -32,12 +32,12 @@ 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 AppendGroupCommand : public DataProcessorCommandBase {
+class AppendGroupCommand : public CommandBase {
 public:
   AppendGroupCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   AppendGroupCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~AppendGroupCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
index 564c1151f225fda696adfead44486ee63c312b44..56f4cc6bb82f934c83441eef064c3c8241055000 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/AppendRowCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDROWCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORAPPENDROWCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
 
 namespace MantidQt {
@@ -32,12 +32,12 @@ 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 AppendRowCommand : public DataProcessorCommandBase {
+class AppendRowCommand : public CommandBase {
 public:
   AppendRowCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   AppendRowCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~AppendRowCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
index 00ed923f8a76e39ab77fdfba3c2ae07a919d6b0b..9ec0f7b0be8b716f2002383fefee4bb064607ab9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/ClearSelectedCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCLEARSELECTEDCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCLEARSELECTEDCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 ClearSelectedCommand : public DataProcessorCommandBase {
+class ClearSelectedCommand : public CommandBase {
 public:
   ClearSelectedCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   ClearSelectedCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~ClearSelectedCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
index 3c956bcbf4995256624f85f98b0cef6dce32f973..040aee5022f1bd2ff400095bac20bddfa2514a53 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CollapseGroupsCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLLAPSEGROUPSCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOLLAPSEGROUPSCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,10 +31,10 @@ 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 CollapseGroupsCommand : public DataProcessorCommandBase {
+class CollapseGroupsCommand : public CommandBase {
 public:
   CollapseGroupsCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter) {}
+      : CommandBase(tablePresenter) {}
   virtual ~CollapseGroupsCommand() {}
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
similarity index 77%
rename from qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
rename to qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
index 85e38b75ea02d456c8d72fd9b8710edf4698aa40..95adee7c16ccd8c064504cea97f2334ce27e2499 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/Command.h
@@ -9,9 +9,9 @@
 namespace MantidQt {
 namespace MantidWidgets {
 namespace DataProcessor {
-/** @class DataProcessorCommand
+/** @class Command
 
-DataProcessorCommand is an interface which defines the functions any data
+Command is an interface which defines the functions any data
 processor action needs to support.
 
 Copyright &copy; 2011-16 ISIS Rutherford Appleton Laboratory, NScD Oak Ridge
@@ -35,10 +35,10 @@ 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 DataProcessorCommand {
+class Command {
 public:
-  DataProcessorCommand() : m_child(){};
-  virtual ~DataProcessorCommand(){};
+  Command() : m_child(){};
+  virtual ~Command(){};
 
   virtual void execute() = 0;
   virtual QString name() = 0;
@@ -48,10 +48,10 @@ public:
   virtual QString shortcut() = 0;
   virtual bool hasChild() final { return !m_child.empty(); };
   virtual void
-  setChild(std::vector<std::unique_ptr<DataProcessorCommand>> child) final {
+  setChild(std::vector<std::unique_ptr<Command>> child) final {
     m_child = std::move(child);
   }
-  virtual std::vector<std::unique_ptr<DataProcessorCommand>> &getChild() final {
+  virtual std::vector<std::unique_ptr<Command>> &getChild() final {
     return m_child;
   }
   virtual bool isSeparator() final {
@@ -59,11 +59,11 @@ public:
   }
 
 protected:
-  std::vector<std::unique_ptr<DataProcessorCommand>> m_child;
+  std::vector<std::unique_ptr<Command>> m_child;
 };
 
 /// Typedef for a shared pointer to \c ReflSearchModel
-using DataProcessorCommand_uptr = std::unique_ptr<DataProcessorCommand>;
+using Command_uptr = std::unique_ptr<Command>;
 }
 }
 }
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
index 5414f258b521b8a32f928acbf497be93c25248d6..5e706e42d92b9e1653f8476255ea378069b4b668 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/CopySelectedCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOPYSELECTEDCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOPYSELECTEDCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 CopySelectedCommand : public DataProcessorCommandBase {
+class CopySelectedCommand : public CommandBase {
 public:
   CopySelectedCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   CopySelectedCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~CopySelectedCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
index 2e7518898d0c17df710e547923cd180730c18405..db8f7c7aafa388317f22ad6f40f2d1d7d2c797d7 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h
@@ -2,7 +2,7 @@
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDADAPTER_H
 
 #include "MantidKernel/make_unique.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include "MantidQtWidgets/Common/DllOption.h"
 #include <QObject>
 #include <memory>
@@ -14,11 +14,11 @@ namespace MantidQt {
 namespace MantidWidgets {
 namespace DataProcessor {
 
-using DataProcessorCommand_uptr = std::unique_ptr<DataProcessorCommand>;
+using Command_uptr = std::unique_ptr<Command>;
 
-/** @class DataProcessorCommandAdapter
+/** @class CommandAdapter
 
-DataProcessorCommandAdapter is an adapter that allows DataProcessorCommands to
+CommandAdapter is an adapter that allows Commands to
 be treated as
 QObjects for signals.
 
@@ -43,14 +43,14 @@ 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 EXPORT_OPT_MANTIDQT_COMMON DataProcessorCommandAdapter : public QObject {
+class EXPORT_OPT_MANTIDQT_COMMON CommandAdapter : public QObject {
   Q_OBJECT
 public:
   /** Constructor: Adds actions to a menu
   * @param menu :: The menu where the actions will be added
   * @param adaptee :: The action to add
   */
-  DataProcessorCommandAdapter(QMenu *menu, DataProcessorCommand_uptr adaptee)
+  CommandAdapter(QMenu *menu, Command_uptr adaptee)
       : m_adaptee(std::move(adaptee)) {
 
     if (m_adaptee->hasChild()) {
@@ -62,7 +62,7 @@ public:
       auto &child = m_adaptee->getChild();
       for (auto &ch : child) {
         m_adapter.push_back(
-            Mantid::Kernel::make_unique<DataProcessorCommandAdapter>(
+            Mantid::Kernel::make_unique<CommandAdapter>(
                 submenu, std::move(ch)));
       }
     } else {
@@ -76,8 +76,8 @@ public:
   * @param toolbar :: The toolbar where actions will be added
   * @param adaptee :: The action to add
   */
-  DataProcessorCommandAdapter(QToolBar *toolbar,
-                              DataProcessorCommand_uptr adaptee)
+  CommandAdapter(QToolBar *toolbar,
+                              Command_uptr adaptee)
       : m_adaptee(std::move(adaptee)) {
 
     if (!m_adaptee->hasChild()) {
@@ -111,12 +111,12 @@ public slots:
 
 private:
   // The adaptee
-  DataProcessorCommand_uptr m_adaptee;
-  std::vector<std::unique_ptr<DataProcessorCommandAdapter>> m_adapter;
+  Command_uptr m_adaptee;
+  std::vector<std::unique_ptr<CommandAdapter>> m_adapter;
 };
 
-using DataProcessorCommandAdapter_uptr =
-    std::unique_ptr<DataProcessorCommandAdapter>;
+using CommandAdapter_uptr =
+    std::unique_ptr<CommandAdapter>;
 }
 }
 }
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
index e202a68197fa943ca6fcab858ca105f996188816..d549b8c22eab8cfc53b1ae45d553af01b1d9e09a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDBASE_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCOMMANDBASE_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h"
 
@@ -35,16 +35,16 @@ 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 DataProcessorCommandBase : public DataProcessorCommand {
+class CommandBase : public Command {
 public:
-  DataProcessorCommandBase(DataProcessorPresenter *tablePresenter)
+  CommandBase(DataProcessorPresenter *tablePresenter)
       : m_presenter(tablePresenter) {
     if (!tablePresenter) {
       throw std::invalid_argument("Invalid abstract presenter");
     }
   };
-  DataProcessorCommandBase(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget.getPresenter()) {}
+  CommandBase(const QDataProcessorWidget &widget)
+      : CommandBase(widget.getPresenter()) {}
 
 protected:
   DataProcessorPresenter *const m_presenter;
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
index ff425a474e244cebd8fcd5246fd39b4581770cdb..1f68538a86c1b0751941736d33b389bad0ab1828 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorCutSelectedCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORCUTSELECTEDCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORCUTSELECTEDCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorCutSelectedCommand : public DataProcessorCommandBase {
+class DataProcessorCutSelectedCommand : public CommandBase {
 public:
   DataProcessorCutSelectedCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorCutSelectedCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorCutSelectedCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
index 8896aa930e0799166acafe238044bc76112dc303..cb3c062719d7c6482cf2b7c4b7c4d2bde8215d36 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteGroupCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEGROUPCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEGROUPCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -32,12 +32,12 @@ 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 DataProcessorDeleteGroupCommand : public DataProcessorCommandBase {
+class DataProcessorDeleteGroupCommand : public CommandBase {
 public:
   DataProcessorDeleteGroupCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorDeleteGroupCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorDeleteGroupCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
index bc8f4fa2bfa00f3aee5d8935085999d814569cde..a1a50b19522a9005f84e7cee0c2627e6869b921e 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorDeleteRowCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEROWCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORDELETEROWCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -32,12 +32,12 @@ 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 DataProcessorDeleteRowCommand : public DataProcessorCommandBase {
+class DataProcessorDeleteRowCommand : public CommandBase {
 public:
   DataProcessorDeleteRowCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorDeleteRowCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorDeleteRowCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
index b11dce5e74e471cc1487ad5a45a811027facf9c9..7acb0166dca5cdcb59208006c2ec734937b514e6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorExpandCommand : public DataProcessorCommandBase {
+class DataProcessorExpandCommand : public CommandBase {
 public:
   DataProcessorExpandCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorExpandCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorExpandCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
index fac75beabb5c1dc125133c12e680c60a78c85d79..8b7972ec8269f85b01e7064cd7b41a4ad7d29d10 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExpandGroupsCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDGROUPSCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPANDGROUPSCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,10 +31,10 @@ 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 DataProcessorExpandGroupsCommand : public DataProcessorCommandBase {
+class DataProcessorExpandGroupsCommand : public CommandBase {
 public:
   DataProcessorExpandGroupsCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter) {}
+      : CommandBase(tablePresenter) {}
   virtual ~DataProcessorExpandGroupsCommand() {}
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
index 6736081bcf2ebb8fea7f4c564dd80202d9a4c55f..e6e6fdc09af62c38446075baad8967bbd02d56e6 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorExportTableCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPORTTABLECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSOREXPORTTABLECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -33,12 +33,12 @@ 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 DataProcessorExportTableCommand : public DataProcessorCommandBase {
+class DataProcessorExportTableCommand : public CommandBase {
 public:
   DataProcessorExportTableCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorExportTableCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorExportTableCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
index cbeea6bed38d28f9436167f83fec34eaa4e375a0..967cad942b01ed1d5622bb12f0d5ae623690f99a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorGroupRowsCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORGROUPROWSCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorGroupRowsCommand : public DataProcessorCommandBase {
+class DataProcessorGroupRowsCommand : public CommandBase {
 public:
   DataProcessorGroupRowsCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorGroupRowsCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorGroupRowsCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
index e39ec2b5e31e8894f8752172f3d396a71d4129ca..e0590ce00607904a974af2e2bffc803257245021 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorImportTableCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORIMPORTTABLECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORIMPORTTABLECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorImportTableCommand : public DataProcessorCommandBase {
+class DataProcessorImportTableCommand : public CommandBase {
 public:
   DataProcessorImportTableCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorImportTableCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorImportTableCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
index 56c535488b8b9c8af5c303d080694bcefe301d7c..1ab0e5ff8c0b697f20b9dd02efb485201872398f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorMockObjects.h
@@ -71,7 +71,7 @@ public:
   // Actions/commands
   // Gmock requires parameters and return values of mocked methods to be
   // copyable which means we have to mock addActions() via a proxy method
-  void addActions(std::vector<DataProcessorCommand_uptr>) override {
+  void addActions(std::vector<Command_uptr>) override {
     addActionsProxy();
   }
   MOCK_METHOD0(addActionsProxy, void());
@@ -146,8 +146,8 @@ private:
     return m_options;
   };
 
-  std::vector<DataProcessorCommand_uptr> publishCommands() override {
-    std::vector<DataProcessorCommand_uptr> commands;
+  std::vector<Command_uptr> publishCommands() override {
+    std::vector<Command_uptr> commands;
     for (size_t i = 0; i < 31; i++)
       commands.push_back(
           Mantid::Kernel::make_unique<AppendRowCommand>(this));
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
index 0ba822968c4a53cd545d0e95a9d40dbac3e114d6..4080e919254f91af41b3be3808f2c10b44f0baea 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorNewTableCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORNEWTABLECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORNEWTABLECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorNewTableCommand : public DataProcessorCommandBase {
+class DataProcessorNewTableCommand : public CommandBase {
 public:
   DataProcessorNewTableCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorNewTableCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorNewTableCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
index 749d2930e1ec90593430df33fba41aa0ffb8e872..79eb289a6130bfa474f43c8d5cf464d96c544678 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h
@@ -53,7 +53,7 @@ public:
   ~DataProcessorOneLevelTreeManager() override;
 
   /// Publish commands
-  std::vector<std::unique_ptr<DataProcessorCommand>> publishCommands() override;
+  std::vector<std::unique_ptr<Command>> publishCommands() override;
   /// Append a row
   void appendRow() override;
   /// Append a group to the model
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
index 18c9d4bf3419f1726a87ccf9460ca524149ff11b..cbfe1898c206702c13c00d42ba02c5977a72e7a1 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOpenTableCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPENTABLECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPENTABLECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorOpenTableCommand : public DataProcessorCommandBase {
+class DataProcessorOpenTableCommand : public CommandBase {
 public:
   DataProcessorOpenTableCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorOpenTableCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorOpenTableCommand(){};
 
   void execute() override{
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
index 867a29737511592d8024774f0de3a7b3e584b551..1d7263afc817f17b1c399c0b3ba45e420c3cd871 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorOptionsCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSTABLECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSOROPTIONSTABLECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorOptionsCommand : public DataProcessorCommandBase {
+class DataProcessorOptionsCommand : public CommandBase {
 public:
   DataProcessorOptionsCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorOptionsCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorOptionsCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
index ace00f8f4f22ad6e218f6d128f517e03305271a6..1a23091ffcabec9fbe1769739ec48df310431f2f 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPasteSelectedCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPASTESELECTEDCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPASTESELECTEDCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorPasteSelectedCommand : public DataProcessorCommandBase {
+class DataProcessorPasteSelectedCommand : public CommandBase {
 public:
   DataProcessorPasteSelectedCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorPasteSelectedCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorPasteSelectedCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
index aea795252dee9e846acc14d649f9c551a2b059c3..a12eaf9b8023b15a831989433af8f0a56262dfef 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPauseCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPAUSECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPAUSECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,10 +31,10 @@ 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 DataProcessorPauseCommand : public DataProcessorCommandBase {
+class DataProcessorPauseCommand : public CommandBase {
 public:
   DataProcessorPauseCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   virtual ~DataProcessorPauseCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
index 6a1fac57617faa9026483a63e18ac9c866312008..6d3c1aa1745bd81217b08eba367074706d963ebf 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotGroupCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTGROUPCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTGROUPCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorPlotGroupCommand : public DataProcessorCommandBase {
+class DataProcessorPlotGroupCommand : public CommandBase {
 public:
   DataProcessorPlotGroupCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorPlotGroupCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorPlotGroupCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
index 249bdbfce2163b221f976caaf56f0f9897444b9e..23089ec8704bb65242d1e0786945b558e9819cfd 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPlotRowCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTROWCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPLOTROWCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorPlotRowCommand : public DataProcessorCommandBase {
+class DataProcessorPlotRowCommand : public CommandBase {
 public:
   DataProcessorPlotRowCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorPlotRowCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorPlotRowCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
index 450204e86eb23cd3bb98d4c2d4e60ce390bcd602..092e3d409712e427a7f1e01362b879976d867d15 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorPresenter.h
@@ -15,7 +15,7 @@ namespace MantidWidgets {
 class ProgressableView;
 namespace DataProcessor {
 // Forward decs
-class DataProcessorCommand;
+class Command;
 class DataProcessorMainPresenter;
 class DataProcessorView;
 
@@ -85,7 +85,7 @@ public:
   transfer(const std::vector<std::map<QString, QString>> &runs) = 0;
   virtual void setInstrumentList(const QStringList &instruments,
                                  const QString &defaultInstrument) = 0;
-  virtual std::vector<std::unique_ptr<DataProcessorCommand>>
+  virtual std::vector<std::unique_ptr<Command>>
   publishCommands() = 0;
   virtual void accept(DataProcessorMainPresenter *mainPresenter) = 0;
   virtual void acceptViews(DataProcessorView *tableView,
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
index 575d7ce21ad76d9a853808505f0751e499140bcb..3ca9a2a612464a4dfb59d7cdb0b8fc5556a615df 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorProcessCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORPROCESSCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -32,12 +32,12 @@ 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 DataProcessorProcessCommand : public DataProcessorCommandBase {
+class DataProcessorProcessCommand : public CommandBase {
 public:
   DataProcessorProcessCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorProcessCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorProcessCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
index 8efab44087083c4ffcf032feff9f302dc8102166..1e7d3e18e7cdcf136f2baf6b7f2f5097817cac9a 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableAsCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLEASCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLEASCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorSaveTableAsCommand : public DataProcessorCommandBase {
+class DataProcessorSaveTableAsCommand : public CommandBase {
 public:
   DataProcessorSaveTableAsCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorSaveTableAsCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorSaveTableAsCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
index 5dd70ea7119b192126a0b52e993c3a784826516c..274e284087211a4b74860259bdd22022d58add20 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSaveTableCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSAVETABLECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,12 +31,12 @@ 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 DataProcessorSaveTableCommand : public DataProcessorCommandBase {
+class DataProcessorSaveTableCommand : public CommandBase {
 public:
   DataProcessorSaveTableCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorSaveTableCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorSaveTableCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h
index e90090ef9b890ca77ca4702d8abafbf02320ef94..c14d888129ce1b27724861ac296719ada6a82270 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorSeparatorCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORSEPARATORCOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORSEPARATORCOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -33,12 +33,12 @@ 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 DataProcessorSeparatorCommand : public DataProcessorCommandBase {
+class DataProcessorSeparatorCommand : public CommandBase {
 public:
   DataProcessorSeparatorCommand(DataProcessorPresenter *tablePresenter)
-      : DataProcessorCommandBase(tablePresenter){};
+      : CommandBase(tablePresenter){};
   DataProcessorSeparatorCommand(const QDataProcessorWidget &widget)
-      : DataProcessorCommandBase(widget){};
+      : CommandBase(widget){};
   virtual ~DataProcessorSeparatorCommand(){};
 
   void execute() override{};
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h
index f8d0eae1ea8275dbe6d0edf40e8d752ce78c95a5..4b6b99d2f4a4b5799cda4777320fab5f5f4d8c40 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTreeManager.h
@@ -15,7 +15,7 @@ namespace MantidQt {
 namespace MantidWidgets {
 namespace DataProcessor {
 
-class DataProcessorCommand;
+class Command;
 class DataProcessorWhiteList;
 
 /** @class DataProcessorTreeManager
@@ -54,7 +54,7 @@ public:
   /// Actions/commands
 
   /// Publish actions/commands
-  virtual std::vector<std::unique_ptr<DataProcessorCommand>>
+  virtual std::vector<std::unique_ptr<Command>>
   publishCommands() = 0;
   /// Append a row
   virtual void appendRow() = 0;
@@ -112,8 +112,8 @@ public:
 
 protected:
   /// Add a command to the list of available commands
-  void addCommand(std::vector<std::unique_ptr<DataProcessorCommand>> &commands,
-                  std::unique_ptr<DataProcessorCommand> command) {
+  void addCommand(std::vector<std::unique_ptr<Command>> &commands,
+                  std::unique_ptr<Command> command) {
     commands.push_back(std::move(command));
   }
 };
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h
index 047698b5aea8617178ed165d37bd4aa76681aa40..ca07c3829f0f5d29baa63ce6baf104780d5bc9e4 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h
@@ -53,7 +53,7 @@ public:
   ~DataProcessorTwoLevelTreeManager() override;
 
   /// Publish commands
-  std::vector<std::unique_ptr<DataProcessorCommand>> publishCommands() override;
+  std::vector<std::unique_ptr<Command>> publishCommands() override;
   /// Append a row
   void appendRow() override;
   /// Append a group to the model
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
index 44395923ed9eed14598e250737fa9a733cb28a18..4e8c3da1698b4496a42f33f66dd8a10428ab82ec 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorView.h
@@ -16,7 +16,7 @@ namespace MantidWidgets {
 class HintStrategy;
 namespace DataProcessor {
 // Forward dec
-class DataProcessorCommand;
+class Command;
 class DataProcessorPresenter;
 
 /** @class DataProcessorView
@@ -54,7 +54,7 @@ public:
 
   // Add actions to the toolbar
   virtual void
-  addActions(std::vector<std::unique_ptr<DataProcessorCommand>> commands) = 0;
+  addActions(std::vector<std::unique_ptr<Command>> commands) = 0;
 
   // Connect the model
   virtual void showTable(boost::shared_ptr<AbstractTreeModel> model) = 0;
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
index 0219e6ef18f746e2ebb6fc6793932d6bcc5a1c4d..03e5ab6fb851fb2454a12fbb5b0e79691e0c59c0 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/DataProcessorWorkspaceCommand.h
@@ -1,7 +1,7 @@
 #ifndef MANTIDQTMANTIDWIDGETS_DATAPROCESSORWORKSPACECOMMAND_H
 #define MANTIDQTMANTIDWIDGETS_DATAPROCESSORWORKSPACECOMMAND_H
 
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandBase.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandBase.h"
 
 namespace MantidQt {
 namespace MantidWidgets {
@@ -31,14 +31,14 @@ 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 DataProcessorCommandBase {
+class DataProcessorWorkspaceCommand : public CommandBase {
 public:
   DataProcessorWorkspaceCommand(DataProcessorPresenter *tablePresenter,
                                 const QString &name)
-      : DataProcessorCommandBase(tablePresenter), m_name(name){};
+      : CommandBase(tablePresenter), m_name(name){};
   DataProcessorWorkspaceCommand(const QDataProcessorWidget &widget,
                                 const QString &name)
-      : DataProcessorCommandBase(widget), m_name(name){};
+      : CommandBase(widget), m_name(name){};
   virtual ~DataProcessorWorkspaceCommand(){};
 
   void execute() override {
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
index 11ae5da85611b4a9e93b1ccbcc43ceb0038f1d02..0d64af41f1f5001226508bb5e0dc2328d1fe79db 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h
@@ -4,7 +4,7 @@
 #include "MantidAPI/ITableWorkspace_fwd.h"
 #include "MantidAPI/AlgorithmManager.h"
 #include "MantidQtWidgets/Common/WorkspaceObserver.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommand.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/Command.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorOneLevelTreeManager.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorTwoLevelTreeManager.h"
@@ -117,7 +117,7 @@ public:
   void transfer(const std::vector<std::map<QString, QString>> &runs) override;
   void setInstrumentList(const QStringList &instruments,
                          const QString &defaultInstrument) override;
-  std::vector<std::unique_ptr<DataProcessorCommand>> publishCommands() override;
+  std::vector<std::unique_ptr<Command>> publishCommands() override;
   void acceptViews(DataProcessorView *tableView,
                    ProgressableView *progressView) override;
   void accept(DataProcessorMainPresenter *mainPresenter) override;
@@ -314,7 +314,7 @@ private:
   void afterReplaceHandle(const std::string &name,
                           Mantid::API::Workspace_sptr workspace) override;
   void saveNotebook(const TreeData &data);
-  std::vector<std::unique_ptr<DataProcessorCommand>> getTableList();
+  std::vector<std::unique_ptr<Command>> getTableList();
 };
 }
 }
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
index 3ade77c3d4def1fb71de18e0e304264c730d0164..0e59ab44048e3aa60b117b124779351108599ab9 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h
@@ -14,7 +14,7 @@ namespace MantidQt {
 namespace MantidWidgets {
 namespace DataProcessor {
 
-class DataProcessorCommandAdapter;
+class CommandAdapter;
 class DataProcessorMainPresenter;
 class DataProcessorPreprocessMap;
 class DataProcessorProcessingAlgorithm;
@@ -74,7 +74,7 @@ public:
 
   // Add actions to the toolbar
   void addActions(
-      std::vector<std::unique_ptr<DataProcessorCommand>> commands) override;
+      std::vector<std::unique_ptr<Command>> commands) override;
 
   // Connect the model
   void
@@ -158,7 +158,7 @@ private:
   QMenu *m_contextMenu;
   QSignalMapper *m_openMap;
   // Command adapters
-  std::vector<std::unique_ptr<DataProcessorCommandAdapter>> m_commands;
+  std::vector<std::unique_ptr<CommandAdapter>> m_commands;
 
 signals:
   void comboProcessInstrument_currentIndexChanged(int index);
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
index 7758a4b4794198d9616a7b3bba5698c19e972386..6ec95e932423c040a802ac977187be4f3cbf6de4 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorOneLevelTreeManager.cpp
@@ -64,10 +64,10 @@ DataProcessorOneLevelTreeManager::~DataProcessorOneLevelTreeManager() {}
 * Publishes a list of available commands
 * @return : The list of available commands
 */
-std::vector<DataProcessorCommand_uptr>
+std::vector<Command_uptr>
 DataProcessorOneLevelTreeManager::publishCommands() {
 
-  std::vector<DataProcessorCommand_uptr> commands;
+  std::vector<Command_uptr> commands;
 
   addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
   addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
index 61be8b79156a23e714e47d30c16c2b005b2c0ac0..0ddbb2f6c700cb61cc3344ff06cf45c9f6e90c13 100644
--- a/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/DataProcessorTwoLevelTreeManager.cpp
@@ -73,10 +73,10 @@ DataProcessorTwoLevelTreeManager::~DataProcessorTwoLevelTreeManager() {}
 * Publishes a list of available commands
 * @return : The list of available commands
 */
-std::vector<DataProcessorCommand_uptr>
+std::vector<Command_uptr>
 DataProcessorTwoLevelTreeManager::publishCommands() {
 
-  std::vector<DataProcessorCommand_uptr> commands;
+  std::vector<Command_uptr> commands;
 
   addCommand(commands, make_unique<DataProcessorOpenTableCommand>(m_presenter));
   addCommand(commands, make_unique<DataProcessorNewTableCommand>(m_presenter));
diff --git a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
index 8085eb3fa1396a122cf3de8b79087296e0e12e3e..b1a24eb7ac64751e0c8e2d6050fb9f24147eddf1 100644
--- a/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/GenericDataProcessorPresenter.cpp
@@ -1574,7 +1574,7 @@ void GenericDataProcessorPresenter::initOptions() {
 void GenericDataProcessorPresenter::addCommands() {
 
   auto commands = m_manager->publishCommands();
-  std::vector<std::unique_ptr<DataProcessorCommand>> commandsToShow;
+  std::vector<std::unique_ptr<Command>> commandsToShow;
   for (auto comm = 10u; comm < commands.size(); comm++)
     commandsToShow.push_back(std::move(commands.at(comm)));
   m_view->addActions(std::move(commandsToShow));
@@ -1626,7 +1626,7 @@ void GenericDataProcessorPresenter::setPromptUser(bool allowPrompt) {
 * Publishes a list of available commands
 * @return : The list of available commands
 */
-std::vector<std::unique_ptr<DataProcessorCommand>>
+std::vector<std::unique_ptr<Command>>
 GenericDataProcessorPresenter::publishCommands() {
 
   auto commands = m_manager->publishCommands();
@@ -1654,10 +1654,10 @@ void GenericDataProcessorPresenter::accept(
 /** Returs the list of valid workspaces currently in the ADS
 * @return : The vector of workspaces (as commands)
 */
-std::vector<DataProcessorCommand_uptr>
+std::vector<Command_uptr>
 GenericDataProcessorPresenter::getTableList() {
 
-  std::vector<DataProcessorCommand_uptr> workspaces;
+  std::vector<Command_uptr> workspaces;
   workspaces.reserve(m_workspaceList.size());
   // Create a command for each of the workspaces in the ADS
   for (const auto &name : m_workspaceList) {
diff --git a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
index fde9320c3048c1d41014298ef97e780707b4a666..a91706be0a912c5c4ec4a8b082491f791d3a2aa0 100644
--- a/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
+++ b/qt/widgets/common/src/DataProcessorUI/QDataProcessorWidget.cpp
@@ -1,6 +1,6 @@
 #include "MantidQtWidgets/Common/DataProcessorUI/QDataProcessorWidget.h"
 #include "MantidQtWidgets/Common/MantidWidget.h"
-#include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorCommandAdapter.h"
+#include "MantidQtWidgets/Common/DataProcessorUI/CommandAdapter.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/DataProcessorMainPresenter.h"
 #include "MantidQtWidgets/Common/DataProcessorUI/GenericDataProcessorPresenter.h"
 #include "MantidQtWidgets/Common/HintingLineEditFactory.h"
@@ -124,12 +124,12 @@ void QDataProcessorWidget::createTable() {
 * @param commands :: A vector of actions (commands)
 */
 void QDataProcessorWidget::addActions(
-    std::vector<std::unique_ptr<DataProcessorCommand>> commands) {
+    std::vector<std::unique_ptr<Command>> commands) {
 
   // Put the commands in the toolbar
   for (auto &command : commands) {
     m_commands.push_back(
-        Mantid::Kernel::make_unique<DataProcessorCommandAdapter>(
+        Mantid::Kernel::make_unique<CommandAdapter>(
             ui.rowToolBar, std::move(command)));
   }
 
diff --git a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
index cfbea1e1edc0eeaa24d7de2cefd7eb897037de95..af02f1b16038f473c4feb0ec8878853cb4e9591c 100644
--- a/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
+++ b/qt/widgets/common/test/DataProcessorUI/DataProcessorCommandsTest.h
@@ -41,16 +41,16 @@ using namespace testing;
 //=====================================================================================
 // Functional tests
 //=====================================================================================
-class DataProcessorCommandsTest : public CxxTest::TestSuite {
+class CommandsTest : public CxxTest::TestSuite {
 
 private:
 public:
   // This pair of boilerplate methods prevent the suite being created statically
   // This means the constructor isn't called when running other tests
-  static DataProcessorCommandsTest *createSuite() {
-    return new DataProcessorCommandsTest();
+  static CommandsTest *createSuite() {
+    return new CommandsTest();
   }
-  static void destroySuite(DataProcessorCommandsTest *suite) { delete suite; }
+  static void destroySuite(CommandsTest *suite) { delete suite; }
 
   void test_open_table_command() {
     NiceMock<MockDataProcessorPresenter> mockPresenter;
diff --git a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
index d21545f8b303548fa8a9114a15f57a80248af31c..c841b5f45f7bc3b58a02f33c96b875d6f2e7e71b 100644
--- a/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
+++ b/scripts/Interface/ui/dataprocessorinterface/data_processor_gui.py
@@ -185,7 +185,7 @@ class DataProcessorGui(QtGui.QMainWindow, ui_data_processor_window.Ui_DataProces
 
     def _create_action(self, command, menu, workspace_list = None):
         """
-        Create an action from a given DataProcessorCommand and add it to a given menu
+        Create an action from a given Command and add it to a given menu
         A 'workspace_list' can be provided but it is only intended to be used with DataProcessorOpenTableCommand.
         It refers to the list of table workspaces in the ADS that could be loaded into the widget. Note that only
         table workspaces with an appropriate number of columns and column types can be loaded.
diff --git a/scripts/Interface/ui/poldi/poldi_gui.py b/scripts/Interface/ui/poldi/poldi_gui.py
index 74d116af37aa21ab72d7f27a8f5f48eb16bf2891..fdc84e218cf0e41ba8d856df4acc11c068f5cf1f 100644
--- a/scripts/Interface/ui/poldi/poldi_gui.py
+++ b/scripts/Interface/ui/poldi/poldi_gui.py
@@ -180,7 +180,7 @@ class PoldiGui(QtGui.QMainWindow, ui_poldi_window.Ui_PoldiWindow):
 
     def _create_action(self, command, menu, workspace_list = None):
         """
-        Create an action from a given DataProcessorCommand and add it to a given menu
+        Create an action from a given Command and add it to a given menu
         A 'workspace_list' can be provided but it is only intended to be used with DataProcessorOpenTableCommand.
         It refers to the list of table workspaces in the ADS that could be loaded into the widget. Note that only
         table workspaces with an appropriate number of columns and column types can be loaded.