diff --git a/Plugins/org.mitk.gui.qt.dicom/files.cmake b/Plugins/org.mitk.gui.qt.dicom/files.cmake
index a250736622..41eca590e4 100644
--- a/Plugins/org.mitk.gui.qt.dicom/files.cmake
+++ b/Plugins/org.mitk.gui.qt.dicom/files.cmake
@@ -1,54 +1,54 @@
 set(SRC_CPP_FILES
 )
 
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
-  QmitkDicomEditor.cpp
+  QmitkDicomBrowser.cpp
   QmitkDicomDirectoryListener.cpp
   QmitkStoreSCPLauncher.cpp
   QmitkStoreSCPLauncherBuilder.cpp
   QmitkDicomDataEventPublisher.cpp
   DicomEventHandler.cpp
   #QmitkDicomPreferencePage.cpp
 )
 
 set(UI_FILES
-  src/internal/QmitkDicomEditorControls.ui
+  src/internal/QmitkDicomBrowserControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
-  src/internal/QmitkDicomEditor.h
+  src/internal/QmitkDicomBrowser.h
   src/internal/QmitkDicomDirectoryListener.h
   src/internal/QmitkStoreSCPLauncher.h
   src/internal/QmitkStoreSCPLauncherBuilder.h
   src/internal/QmitkDicomDataEventPublisher.h
   src/internal/DicomEventHandler.h
   #src/internal/QmitkDicomPreferencePage.h
 )
 
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
 set(CACHED_RESOURCE_FILES
   resources/icon.xpm
   plugin.xml
 )
 
 # list of Qt .qrc files which contain additional resources
 # specific to this plugin
 set(QRC_FILES
 resources/dicom.qrc
 )
 
 set(CPP_FILES )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
 
diff --git a/Plugins/org.mitk.gui.qt.dicom/plugin.xml b/Plugins/org.mitk.gui.qt.dicom/plugin.xml
index 36cf43054f..fcfa280798 100644
--- a/Plugins/org.mitk.gui.qt.dicom/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.dicom/plugin.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
   <extension point="org.blueberry.ui.editors">
     <editor
       id="org.mitk.editors.dicomeditor"
-      name="MITK DICOM Editor"
-      class="QmitkDicomEditor"
+      name="MITK DICOM Browser"
+      class="QmitkDicomBrowser"
       icon="resources/dcm-icon_32.png" >
     </editor>
   </extension>
   <!--
   <extension point="org.blueberry.ui.preferencePages">
     <page id="org.mitk.gui.qt.application.QmitkDicomPreferencePage" name="Dicom Editor" class="QmitkDicomPreferencePage">
       <keywordreference id="org.mitk.gui.qt.application.DataManagerPreferencePageKeywords"></keywordreference>
     </page>
   </extension>
   !-->
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowser.cpp
similarity index 83%
rename from Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
rename to Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowser.cpp
index 8952d1c448..f084e5d70a 100644
--- a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
+++ b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowser.cpp
@@ -1,200 +1,200 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 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.
 
 ===================================================================*/
 
 // Qmitk
-#include "QmitkDicomEditor.h"
+#include "QmitkDicomBrowser.h"
 #include "mitkPluginActivator.h"
 
 
-const std::string QmitkDicomEditor::EDITOR_ID = "org.mitk.editors.dicomeditor";
-const QString QmitkDicomEditor::TEMP_DICOM_FOLDER_SUFFIX="TmpDicomFolder";
+const std::string QmitkDicomBrowser::EDITOR_ID = "org.mitk.editors.dicombrowser";
+const QString QmitkDicomBrowser::TEMP_DICOM_FOLDER_SUFFIX="TmpDicomFolder";
 
 
-QmitkDicomEditor::QmitkDicomEditor()
+QmitkDicomBrowser::QmitkDicomBrowser()
 : m_Thread(new QThread())
 , m_DicomDirectoryListener(new QmitkDicomDirectoryListener())
 , m_StoreSCPLauncher(new QmitkStoreSCPLauncher(&m_Builder))
 , m_Publisher(new QmitkDicomDataEventPublisher())
 {
 }
 
-QmitkDicomEditor::~QmitkDicomEditor()
+QmitkDicomBrowser::~QmitkDicomBrowser()
 {
     m_Thread.quit();
     m_Thread.wait(1000);
     delete m_DicomDirectoryListener;
     delete m_StoreSCPLauncher;
     delete m_Handler;
     delete m_Publisher;
 }
 
-void QmitkDicomEditor::CreateQtPartControl(QWidget *parent )
+void QmitkDicomBrowser::CreateQtPartControl(QWidget *parent )
 {
     m_Controls.setupUi( parent );
     m_Controls.StoreSCPStatusLabel->setTextFormat(Qt::RichText);
     m_Controls.StoreSCPStatusLabel->setText("<img src=':/org.mitk.gui.qt.dicom/network-offline_16.png'>");
 
 
     TestHandler();
 
     SetPluginDirectory();
     SetDatabaseDirectory("DatabaseDirectory");
     CreateTemporaryDirectory();
     StartDicomDirectoryListener();
 
     m_Controls.m_ctkDICOMQueryRetrieveWidget->useProgressDialog(false);
 
     connect(m_Controls.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(OnTabChanged(int)));
 
     connect(m_Controls.externalDataWidget,SIGNAL(SignalStartDicomImport(const QStringList&)),
             m_Controls.internalDataWidget,SLOT(OnStartDicomImport(const QStringList&)));
 
     connect(m_Controls.externalDataWidget,SIGNAL(SignalDicomToDataManager(const QHash<QString,QVariant>&)),
             this,SLOT(OnViewButtonAddToDataManager(const QHash<QString,QVariant>&)));
 
     connect(m_Controls.internalDataWidget,SIGNAL(SignalFinishedImport()),this, SLOT(OnDicomImportFinished()));
     connect(m_Controls.internalDataWidget,SIGNAL(SignalDicomToDataManager(const QHash<QString,QVariant>&)),
             this,SLOT(OnViewButtonAddToDataManager(const QHash<QString,QVariant>&)));
 }
 
 
-void QmitkDicomEditor::Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input)
+void QmitkDicomBrowser::Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input)
 {
     this->SetSite(site);
     this->SetInput(input);
 }
 
-void QmitkDicomEditor::SetFocus()
+void QmitkDicomBrowser::SetFocus()
 {
 }
 
-berry::IPartListener::Events::Types QmitkDicomEditor::GetPartEventTypes() const
+berry::IPartListener::Events::Types QmitkDicomBrowser::GetPartEventTypes() const
 {
     return Events::CLOSED | Events::HIDDEN | Events::VISIBLE;
 }
 
-void QmitkDicomEditor::OnTabChanged(int page)
+void QmitkDicomBrowser::OnTabChanged(int page)
 {
   if (page == 2)//Query/Retrieve is selected
   {
     QString storagePort = m_Controls.m_ctkDICOMQueryRetrieveWidget->getServerParameters()["StoragePort"].toString();
     QString storageAET = m_Controls.m_ctkDICOMQueryRetrieveWidget->getServerParameters()["StorageAETitle"].toString();
      if(!((m_Builder.GetAETitle()->compare(storageAET,Qt::CaseSensitive)==0)&&
          (m_Builder.GetPort()->compare(storagePort,Qt::CaseSensitive)==0)))
      {
          StopStoreSCP();
          StartStoreSCP();
      }
   }
 }
 
-void QmitkDicomEditor::OnDicomImportFinished()
+void QmitkDicomBrowser::OnDicomImportFinished()
 {
   m_Controls.tabWidget->setCurrentIndex(0);
 }
 
-void QmitkDicomEditor::StartDicomDirectoryListener()
+void QmitkDicomBrowser::StartDicomDirectoryListener()
 {
     if(!m_Thread.isRunning())
     {
         m_DicomDirectoryListener->SetDicomListenerDirectory(m_TempDirectory);
         m_DicomDirectoryListener->SetDicomFolderSuffix(TEMP_DICOM_FOLDER_SUFFIX);
         connect(m_DicomDirectoryListener,SIGNAL(SignalStartDicomImport(const QStringList&)),m_Controls.internalDataWidget,SLOT(OnStartDicomImport(const QStringList&)),Qt::DirectConnection);
         //connect(m_Controls.internalDataWidget,SIGNAL(SignalFinishedImport()),m_DicomDirectoryListener,SLOT(OnImportFinished()),Qt::DirectConnection);
         m_DicomDirectoryListener->moveToThread(&m_Thread);
         m_Thread.start();
     }
 }
 
 
-void QmitkDicomEditor::TestHandler()
+void QmitkDicomBrowser::TestHandler()
 {
     m_Handler = new DicomEventHandler();
     m_Handler->SubscribeSlots();
 }
 
-void QmitkDicomEditor::OnViewButtonAddToDataManager(QHash<QString, QVariant> eventProperties)
+void QmitkDicomBrowser::OnViewButtonAddToDataManager(QHash<QString, QVariant> eventProperties)
 {
     ctkDictionary properties;
 //    properties["PatientName"] = eventProperties["PatientName"];
 //    properties["StudyUID"] = eventProperties["StudyUID"];
 //    properties["StudyName"] = eventProperties["StudyName"];
 //    properties["SeriesUID"] = eventProperties["SeriesUID"];
 //    properties["SeriesName"] = eventProperties["SeriesName"];
     properties["FilesForSeries"] = eventProperties["FilesForSeries"];
 
     m_Publisher->PublishSignals(mitk::PluginActivator::getContext());
     m_Publisher->AddSeriesToDataManagerEvent(properties);
 }
 
 
-void QmitkDicomEditor::StartStoreSCP()
+void QmitkDicomBrowser::StartStoreSCP()
 {
     QString storagePort = m_Controls.m_ctkDICOMQueryRetrieveWidget->getServerParameters()["StoragePort"].toString();
     QString storageAET = m_Controls.m_ctkDICOMQueryRetrieveWidget->getServerParameters()["StorageAETitle"].toString();
     m_Builder.AddPort(storagePort)->AddAETitle(storageAET)->AddTransferSyntax()->AddOtherNetworkOptions()->AddMode()->AddOutputDirectory(m_TempDirectory);
     m_StoreSCPLauncher = new QmitkStoreSCPLauncher(&m_Builder);
     connect(m_StoreSCPLauncher, SIGNAL(SignalStatusOfStoreSCP(const QString&)), this, SLOT(OnStoreSCPStatusChanged(const QString&)));
     connect(m_StoreSCPLauncher ,SIGNAL(SignalStartImport(const QStringList&)),m_Controls.internalDataWidget,SLOT(OnStartDicomImport(const QStringList&)));
     connect(m_StoreSCPLauncher ,SIGNAL(SignalStoreSCPError(const QString&)),m_DicomDirectoryListener,SLOT(OnDicomNetworkError(const QString&)),Qt::DirectConnection);
     connect(m_StoreSCPLauncher ,SIGNAL(SignalStoreSCPError(const QString&)),this,SLOT(OnDicomNetworkError(const QString&)),Qt::DirectConnection);
     m_StoreSCPLauncher->StartStoreSCP();
 
 }
 
-void QmitkDicomEditor::OnStoreSCPStatusChanged(const QString& status)
+void QmitkDicomBrowser::OnStoreSCPStatusChanged(const QString& status)
 {
     m_Controls.StoreSCPStatusLabel->setText("<img src=':/org.mitk.gui.qt.dicom/network-idle_16.png'> "+status);
 }
 
-void QmitkDicomEditor::OnDicomNetworkError(const QString& status)
+void QmitkDicomBrowser::OnDicomNetworkError(const QString& status)
 {
     m_Controls.StoreSCPStatusLabel->setText("<img src=':/org.mitk.gui.qt.dicom/network-error_16.png'> "+status);
 }
 
-void QmitkDicomEditor::StopStoreSCP()
+void QmitkDicomBrowser::StopStoreSCP()
 {
     delete m_StoreSCPLauncher;
 }
 
-void QmitkDicomEditor::SetPluginDirectory()
+void QmitkDicomBrowser::SetPluginDirectory()
 {
      m_PluginDirectory = mitk::PluginActivator::getContext()->getDataFile("").absolutePath();
      m_PluginDirectory.append("/");
 }
 
-void QmitkDicomEditor::SetDatabaseDirectory(const QString& databaseDirectory)
+void QmitkDicomBrowser::SetDatabaseDirectory(const QString& databaseDirectory)
 {
     m_DatabaseDirectory.clear();
     m_DatabaseDirectory.append(m_PluginDirectory);
     m_DatabaseDirectory.append(databaseDirectory);
     m_Controls.internalDataWidget->SetDatabaseDirectory(m_DatabaseDirectory);
 }
 
-void QmitkDicomEditor::CreateTemporaryDirectory()
+void QmitkDicomBrowser::CreateTemporaryDirectory()
 {
     QDir tmp;
     QString tmpPath = QDir::tempPath();
     m_TempDirectory.clear();
     m_TempDirectory.append(tmpPath);
     m_TempDirectory.append(QString("/"));
     m_TempDirectory.append(TEMP_DICOM_FOLDER_SUFFIX);
     m_TempDirectory.append(QString("."));
     m_TempDirectory.append(QTime::currentTime().toString("hhmmsszzz"));
     m_TempDirectory.append(QString::number(QCoreApplication::applicationPid()));
     tmp.mkdir(QDir::toNativeSeparators( m_TempDirectory ));
 
 }
diff --git a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowser.h
similarity index 85%
rename from Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h
rename to Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowser.h
index 8586df4398..dfa44ce2b8 100644
--- a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.h
+++ b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowser.h
@@ -1,150 +1,150 @@
 /*=========================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 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 QmitkDicomEditor_h
-#define QmitkDicomEditor_h
+#ifndef QmitkDicomBrowser_h
+#define QmitkDicomBrowser_h
 
 // Blueberry
 #include <berryIPartListener.h>
 #include <berryISelectionListener.h>
 #include <berryQtEditorPart.h>
 
 // MITK
 #include "DicomEventHandler.h"
 #include "QmitkDicomDataEventPublisher.h"
 #include "QmitkDicomDirectoryListener.h"
 #include "QmitkStoreSCPLauncher.h"
 #include "QmitkStoreSCPLauncherBuilder.h"
-#include "ui_QmitkDicomEditorControls.h"
+#include "ui_QmitkDicomBrowserControls.h"
 #include <org_mitk_gui_qt_dicom_Export.h>
 
 // Qt
 #include <QObject>
 #include <QString>
 #include <QStringList>
 #include <QThread>
 #include <QVariant>
 
 /**
-* \brief QmitkDicomEditor is an editor providing functionality for dicom storage and import and query retrieve functionality.
+* \brief QmitkDicomBrowser is an editor providing functionality for dicom storage and import and query retrieve functionality.
 *
 * \sa berry::IPartListener
 * \ingroup ${plugin_target}_internal
 */
-class DICOM_EXPORT QmitkDicomEditor : public berry::QtEditorPart, virtual public berry::IPartListener
+class DICOM_EXPORT QmitkDicomBrowser : public berry::QtEditorPart, virtual public berry::IPartListener
 {
 // this is needed for all Qt objects that should have a Qt meta-object
     // (everything that derives from QObject and wants to have signal/slots)
     Q_OBJECT
 
 public:
 
-    berryObjectMacro(QmitkDicomEditor);
+    berryObjectMacro(QmitkDicomBrowser);
     static const std::string EDITOR_ID;
     static const QString TEMP_DICOM_FOLDER_SUFFIX;
 
    /**
-    * \brief QmitkDicomEditor constructor.
+    * \brief QmitkDicomBrowser constructor.
     */
-    QmitkDicomEditor();
+    QmitkDicomBrowser();
 
    /**
-    * \brief QmitkDicomEditor destructor.
+    * \brief QmitkDicomBrowser destructor.
     */
-    virtual ~QmitkDicomEditor();
+    virtual ~QmitkDicomBrowser();
 
    /**
     * \brief Init initialize the editor.
     */
     void Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input);
 
     void SetFocus();
     void DoSave() {}
     void DoSaveAs() {}
     bool IsDirty() const { return false; }
     bool IsSaveAsAllowed() const { return false; }
 
 signals:
 
    /**
     * \brief SignalStartDicomImport is enitted when dicom directory for import was selected.
     */
     void SignalStartDicomImport(const QString&);
 
 protected slots:
 
     /// \brief Called when import is finished.
     void OnDicomImportFinished();
 
     /// \brief Called when Query Retrieve or Import Folder was clicked.
     void OnTabChanged(int);
 
     /// \brief Called when view button is clicked. Sends out an event for adding the current selected file to the mitkDataStorage.
     void OnViewButtonAddToDataManager(QHash<QString, QVariant> eventProperties);
 
     /// \brief Called when status of dicom storage provider changes.
     void OnStoreSCPStatusChanged(const QString& status);
 
     /// \brief Called when dicom storage provider emits a network error.
     void OnDicomNetworkError(const QString& status);
 
 protected:
 
     /// \brief StartStoreSCP starts  dicom storage provider.
     void StartStoreSCP();
 
     /// \brief StopStoreSCP stops dicom storage provider.
     void StopStoreSCP();
 
     /// \brief TestHandler initializes event handler.
     void TestHandler();
 
     /// \brief Sets database directory.
     void SetDatabaseDirectory(const QString& databaseDirectory);
 
     /// \brief CreateTemporaryDirectory creates temporary directory in which temorary dicom objects are stored.
     void CreateTemporaryDirectory();
 
     /// \brief StartDicomDirectoryListener starts dicom directory listener.
     void StartDicomDirectoryListener();
 
 
    /**
-    * \brief CreateQtPartControl(QWidget *parent) sets the view objects from ui_QmitkDicomeditorControls.h.
+    * \brief CreateQtPartControl(QWidget *parent) sets the view objects from ui_QmitkDicomBrowserControls.h.
     *
     * \param parent is a pointer to the parent widget
     */
     void CreateQtPartControl(QWidget *parent);
 
     /// \brief SetPluginDirectory Sets plugin directory.
     void SetPluginDirectory();
 
     Events::Types GetPartEventTypes() const;
 
     ctkFileDialog* m_ImportDialog;
-    Ui::QmitkDicomEditorControls m_Controls;
+    Ui::QmitkDicomBrowserControls m_Controls;
     QThread m_Thread;
     QmitkDicomDirectoryListener* m_DicomDirectoryListener;
     QmitkStoreSCPLauncherBuilder m_Builder;
     QmitkStoreSCPLauncher* m_StoreSCPLauncher;
     DicomEventHandler* m_Handler;
     QmitkDicomDataEventPublisher* m_Publisher;
     QString m_PluginDirectory;
     QString m_TempDirectory;
     QString m_DatabaseDirectory;
 };
 
-#endif // QmitkDicomEditor_h
+#endif // QmitkDicomBrowser_h
diff --git a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditorControls.ui b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowserControls.ui
similarity index 99%
rename from Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditorControls.ui
rename to Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowserControls.ui
index d98a41b59a..7dfd7b9d0a 100644
--- a/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditorControls.ui
+++ b/Plugins/org.mitk.gui.qt.dicom/src/internal/QmitkDicomBrowserControls.ui
@@ -1,307 +1,307 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QmitkDicomEditorControls</class>
- <widget class="QWidget" name="QmitkDicomEditorControls">
+ <class>QmitkDicomBrowserControls</class>
+ <widget class="QWidget" name="QmitkDicomBrowserControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>752</width>
     <height>696</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="acceptDrops">
    <bool>false</bool>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="widgetResizable">
       <bool>true</bool>
      </property>
      <widget class="QWidget" name="scrollAreaWidgetContents_2">
       <property name="geometry">
        <rect>
         <x>0</x>
         <y>0</y>
         <width>738</width>
         <height>682</height>
        </rect>
       </property>
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QTabWidget" name="tabWidget">
          <property name="enabled">
           <bool>true</bool>
          </property>
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="styleSheet">
           <string notr="true"/>
          </property>
          <property name="tabPosition">
           <enum>QTabWidget::North</enum>
          </property>
          <property name="tabShape">
           <enum>QTabWidget::Rounded</enum>
          </property>
          <property name="currentIndex">
           <number>2</number>
          </property>
          <property name="iconSize">
           <size>
            <width>32</width>
            <height>32</height>
           </size>
          </property>
          <widget class="QWidget" name="tabWidgetPage1">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <attribute name="icon">
            <iconset resource="../../resources/dicom.qrc">
             <normaloff>:/org.mitk.gui.qt.dicom/drive-harddisk_32.png</normaloff>:/org.mitk.gui.qt.dicom/drive-harddisk_32.png</iconset>
           </attribute>
           <attribute name="title">
            <string>Local Storage</string>
           </attribute>
           <attribute name="toolTip">
            <string>Manage your local dicom imports</string>
           </attribute>
           <layout class="QVBoxLayout" name="verticalLayout_3">
            <item>
             <widget class="QmitkDicomLocalStorageWidget" name="internalDataWidget" native="true">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
             </widget>
            </item>
           </layout>
          </widget>
          <widget class="QWidget" name="tabWidgetPage2">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <attribute name="icon">
            <iconset resource="../../resources/dicom.qrc">
             <normaloff>:/org.mitk.gui.qt.dicom/import_32.png</normaloff>
             <selectedon>:/org.mitk.gui.qt.dicom/import_32.png</selectedon>:/org.mitk.gui.qt.dicom/import_32.png</iconset>
           </attribute>
           <attribute name="title">
            <string>Import</string>
           </attribute>
           <attribute name="toolTip">
            <string>Import dicom data from any hard drive</string>
           </attribute>
           <layout class="QVBoxLayout" name="verticalLayout_9">
            <item>
             <widget class="QmitkDicomExternalDataWidget" name="externalDataWidget" native="true">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
             </widget>
            </item>
           </layout>
          </widget>
          <widget class="QWidget" name="tabWidgetPage3">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <attribute name="icon">
            <iconset resource="../../resources/dicom.qrc">
             <normaloff>:/org.mitk.gui.qt.dicom/network-workgroup_32.png</normaloff>:/org.mitk.gui.qt.dicom/network-workgroup_32.png</iconset>
           </attribute>
           <attribute name="title">
            <string>Query Retrieve</string>
           </attribute>
           <attribute name="toolTip">
            <string>Query and retrieve dicom data from server</string>
           </attribute>
           <layout class="QVBoxLayout" name="verticalLayout_12">
            <item>
             <widget class="QLabel" name="label">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="styleSheet">
               <string notr="true">color: rgb(255, 0, 0);</string>
              </property>
              <property name="text">
               <string>Warning: This is currently an experimental feature!</string>
              </property>
             </widget>
            </item>
            <item>
             <widget class="ctkDICOMQueryRetrieveWidget" name="m_ctkDICOMQueryRetrieveWidget" native="true">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
             </widget>
            </item>
           </layout>
          </widget>
         </widget>
        </item>
        <item>
         <widget class="QFrame" name="frame_2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
          <property name="frameShadow">
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QHBoxLayout" name="horizontalLayout">
           <property name="spacing">
            <number>0</number>
           </property>
           <property name="margin">
            <number>0</number>
           </property>
           <item>
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeType">
              <enum>QSizePolicy::Minimum</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>4</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
           <item>
            <widget class="QLabel" name="StoreSCPStatusLabel">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
             <property name="text">
              <string/>
             </property>
             <property name="textFormat">
              <enum>Qt::RichText</enum>
             </property>
            </widget>
           </item>
           <item>
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>ctkDICOMQueryRetrieveWidget</class>
    <extends>QWidget</extends>
    <header>ctkDICOMQueryRetrieveWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkDicomLocalStorageWidget</class>
    <extends>QWidget</extends>
    <header>Qmitk/QmitkDicomLocalStorageWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkDicomExternalDataWidget</class>
    <extends>QWidget</extends>
    <header>Qmitk/QmitkDicomExternalDataWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../../resources/dicom.qrc"/>
  </resources>
  <connections/>
  <slots>
   <slot>OnChangePage(int)</slot>
  </slots>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.dicom/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.dicom/src/internal/mitkPluginActivator.cpp
index ec771fb529..516fd7e11e 100644
--- a/Plugins/org.mitk.gui.qt.dicom/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.dicom/src/internal/mitkPluginActivator.cpp
@@ -1,47 +1,47 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 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 "mitkPluginActivator.h"
 
 #include <QtPlugin>
 
-#include "QmitkDicomEditor.h"
+#include "QmitkDicomBrowser.h"
 //#include "QmitkDicomPreferencePage.h"
 
 namespace mitk {
 
 ctkPluginContext* PluginActivator::pluginContext = 0;
 
 void PluginActivator::start(ctkPluginContext* context)
 {
-  BERRY_REGISTER_EXTENSION_CLASS(QmitkDicomEditor, context)
+  BERRY_REGISTER_EXTENSION_CLASS(QmitkDicomBrowser, context)
   //BERRY_REGISTER_EXTENSION_CLASS(QmitkDicomPreferencePage, context)
   pluginContext = context;
 }
 
 void PluginActivator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
   pluginContext = NULL;
 }
 ctkPluginContext* PluginActivator::getContext()
 {
     return pluginContext;
 }
 
 }
 
 Q_EXPORT_PLUGIN2(org_mitk_gui_qt_dicom, mitk::PluginActivator)