diff --git a/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.cpp b/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.cpp
index 32ba36e4dc..a0a53212ac 100644
--- a/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.cpp
+++ b/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.cpp
@@ -1,64 +1,64 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) University College London (UCL).
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
  
 #include "QmitkUiLoader.h"
 #include "QmitkDataStorageComboBoxWithSelectNone.h"
 #include "mitkNodePredicateDataType.h"
 
 //-----------------------------------------------------------------------------
 QmitkUiLoader::QmitkUiLoader(const mitk::DataStorage* dataStorage, QObject *parent)
-  : QUiLoader(parent)
+  : ctkCmdLineModuleQtUiLoader(parent)
 , m_DataStorage(dataStorage)
 {
 
 }
 
 
 //-----------------------------------------------------------------------------
 QmitkUiLoader::~QmitkUiLoader()
 {
 
 }
 
 
 //-----------------------------------------------------------------------------
 QStringList QmitkUiLoader::availableWidgets () const
 {
-  QStringList availableWidgets = QUiLoader::availableWidgets();
+  QStringList availableWidgets = ctkCmdLineModuleQtUiLoader::availableWidgets();
   availableWidgets << "QmitkDataStorageComboBoxWithSelectNone";
   return availableWidgets;
 }
 
 
 //-----------------------------------------------------------------------------
 QWidget* QmitkUiLoader::createWidget(const QString& className, QWidget* parent, const QString& name)
 {
   QWidget* widget = NULL;
   if (className == "QmitkDataStorageComboBoxWithSelectNone")
   {
     QmitkDataStorageComboBoxWithSelectNone* comboBox = new QmitkDataStorageComboBoxWithSelectNone(parent);
     comboBox->setObjectName(name);
     comboBox->SetAutoSelectNewItems(false);
     comboBox->SetPredicate(mitk::NodePredicateDataType::New("Image"));
     comboBox->SetDataStorage(const_cast<mitk::DataStorage*>(m_DataStorage));
     comboBox->setCurrentIndex(0);
     widget = comboBox;
   }
   else
   {
-    widget = QUiLoader::createWidget(className, parent, name);
+    widget = ctkCmdLineModuleQtUiLoader::createWidget(className, parent, name);
   }
   return widget;
 }
diff --git a/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.h b/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.h
index 08928f9a0a..e2cdc5630f 100644
--- a/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.h
+++ b/Plugins/org.mitk.gui.qt.cli/src/internal/QmitkUiLoader.h
@@ -1,58 +1,58 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) University College London (UCL).
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
  
 #ifndef QmitkUiLoader_h
 #define QmitkUiLoader_h
 
-#include <QUiLoader>
+#include <ctkCmdLineModuleQtUiLoader.h>
 #include <QStringList>
 #include "mitkDataStorage.h"
 
 /**
  * \class QmitkUiLoader
- * \brief Derived from QUiLoader to enable us to instantiate widgets from Qmitk at runtime,
+ * \brief Derived from ctkCmdLineModuleQtGuiLoader to enable us to instantiate widgets from Qmitk at runtime,
  * and currently we instatiate QmitkDataStorageComboBoxWithSelectNone, used for image input widgets.
  * \author Matt Clarkson (m.clarkson@ucl.ac.uk)
  * \ingroup org_mitk_gui_qt_cli_internal
  */
-class QmitkUiLoader : public QUiLoader
+class QmitkUiLoader : public ctkCmdLineModuleQtUiLoader
 {
 
   Q_OBJECT
 
 public:
   QmitkUiLoader(const mitk::DataStorage* dataStorage, QObject *parent=0);
   virtual ~QmitkUiLoader();
 
   /**
-   * \brief Returns the list of available widgets in QUiLoader and also QmitkDataStorageComboBoxWithSelectNone.
-   * \see QUiLoader::availableWidgets()
+   * \brief Returns the list of available widgets in ctkCmdLineModuleQtGuiLoader and also QmitkDataStorageComboBoxWithSelectNone.
+   * \see ctkCmdLineModuleQtGuiLoader::availableWidgets()
    */
   QStringList availableWidgets () const;
 
   /**
    * \brief If className is QmitkDataStorageComboBox, instantiates QmitkDataStorageComboBoxWithSelectNone and
    * otherwise delegates to base class.
-   * \see QUiLoader::createWidget()
+   * \see ctkCmdLineModuleQtGuiLoader::createWidget()
    */
   virtual QWidget* createWidget(const QString & className, QWidget * parent = 0, const QString & name = QString() );
 
 private:
 
   const mitk::DataStorage* m_DataStorage;
 
 }; // end class
 
 #endif // QmitkUiLoader_h