diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake b/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake
index 5b58d0228e..29b65c5e53 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/files.cmake
@@ -1,47 +1,47 @@
 set(SRC_CPP_FILES
   QmitkViewNavigatorWidget.cpp
 
 #  mitkQtPerspectiveItem.h
 #  mitkQtViewItem.h
 )
 
 set(INTERNAL_CPP_FILES
-  org_mitk_gui_qt_viewnavigator_Activator.cpp
+  mitkPluginActivator.cpp
   ViewNavigatorView.cpp
 )
 
 set(UI_FILES
   src/QmitkViewNavigatorWidgetControls.ui
 )
 
 set(MOC_H_FILES
-  src/internal/org_mitk_gui_qt_viewnavigator_Activator.h
+  src/internal/mitkPluginActivator.h
   src/internal/ViewNavigatorView.h
 
   src/QmitkViewNavigatorWidget.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/view-manager.svg
   plugin.xml
 )
 
 # list of Qt .qrc files which contain additional resources
 # specific to this plugin
 set(QRC_FILES
 
 )
 
 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.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.cpp
similarity index 68%
rename from Plugins/org.mitk.gui.qt.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.cpp
rename to Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.cpp
index 2f2991cbbf..d493ab8727 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.cpp
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.cpp
@@ -1,29 +1,24 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
-
-#include "org_mitk_gui_qt_viewnavigator_Activator.h"
+#include "mitkPluginActivator.h"
 #include "ViewNavigatorView.h"
 
-namespace mitk {
-
-void org_mitk_gui_qt_viewnavigator_Activator::start(ctkPluginContext* context)
+void mitk::PluginActivator::start(ctkPluginContext* context)
 {
   BERRY_REGISTER_EXTENSION_CLASS(ViewNavigatorView, context)
 }
 
-void org_mitk_gui_qt_viewnavigator_Activator::stop(ctkPluginContext* context)
+void mitk::PluginActivator::stop(ctkPluginContext* context)
 {
   Q_UNUSED(context)
 }
-
-}
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.h
new file mode 100644
index 0000000000..c2daea8f73
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/mitkPluginActivator.h
@@ -0,0 +1,33 @@
+/*============================================================================
+
+The Medical Imaging Interaction Toolkit (MITK)
+
+Copyright (c) German Cancer Research Center (DKFZ)
+All rights reserved.
+
+Use of this source code is governed by a 3-clause BSD license that can be
+found in the LICENSE file.
+
+============================================================================*/
+
+#ifndef MITKPLUGINACTIVATOR_H
+#define MITKPLUGINACTIVATOR_H
+
+#include <ctkPluginActivator.h>
+
+namespace mitk
+{
+  class PluginActivator : public QObject, public ctkPluginActivator
+  {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_viewnavigator")
+    Q_INTERFACES(ctkPluginActivator)
+
+  public:
+    void start(ctkPluginContext *context) override;
+    void stop(ctkPluginContext *context) override;
+
+  };
+}
+
+#endif // MITKPLUGINACTIVATOR_H
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.h
deleted file mode 100644
index a14a2a6286..0000000000
--- a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/org_mitk_gui_qt_viewnavigator_Activator.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*============================================================================
-
-The Medical Imaging Interaction Toolkit (MITK)
-
-Copyright (c) German Cancer Research Center (DKFZ)
-All rights reserved.
-
-Use of this source code is governed by a 3-clause BSD license that can be
-found in the LICENSE file.
-
-============================================================================*/
-
-
-#ifndef org_mitk_gui_qt_viewnavigator_Activator_h
-#define org_mitk_gui_qt_viewnavigator_Activator_h
-
-#include <ctkPluginActivator.h>
-
-namespace mitk {
-
-class org_mitk_gui_qt_viewnavigator_Activator :
-  public QObject, public ctkPluginActivator
-{
-  Q_OBJECT
-  Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_viewnavigator")
-  Q_INTERFACES(ctkPluginActivator)
-
-public:
-
-  void start(ctkPluginContext* context) override;
-  void stop(ctkPluginContext* context) override;
-
-}; // org_mitk_gui_qt_viewnavigator_Activator
-
-}
-
-#endif // org_mitk_gui_qt_viewnavigator_Activator_h