diff --git a/Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt b/Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt
index 53b8a44ceb..28dfd3d235 100644
--- a/Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.igt.app.echotrack/CMakeLists.txt
@@ -1,16 +1,16 @@
-project(org_mitk_gui_qt_igtappechotrack)
+project(org_mitk_gui_qt_igt_app_echotrack)
 
-MACRO_CREATE_MITK_CTK_PLUGIN(
+mitk_create_plugin(
   EXPORT_DIRECTIVE IGTAPPECHOTRACK_EXPORT
   EXPORTED_INCLUDE_SUFFIXES src
   PACKAGE_DEPENDS CTK Poco
   MODULE_DEPENDS MitkUSUI MitkUSNavigation MitkIGTUI MitkSceneSerialization MitkContourModel
 )
 
 #usFunctionAddResources(TARGET ${PLUGIN_TARGET}
 #  MODULE_NAME liborg_mitk_gui_qt_usnavigation
 #  WORKING_DIRECTORY resources
 #  FILES Interactions/USPointMarkInteractions.xml
 #        Interactions/USZoneInteractions.xml
 #        Interactions/USZoneInteractionsHold.xml
 #)
diff --git a/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp b/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp
index e7baba9e85..f8a17098f1 100644
--- a/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp
+++ b/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/org_mbi_gui_qt_usnavigation_Activator.cpp
@@ -1,67 +1,67 @@
 /*===================================================================
 
 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 "org_mbi_gui_qt_usnavigation_Activator.h"
 
 #include <usModuleInitialization.h>
 #include <QtPlugin>
 
 //#include "USNavigation.h"
 #include "UltrasoundCalibration.h"
 #include "USNavigationMarkerPlacement.h"
 #include "QmitkUSNavigationPerspective.h"
 
 #include "mitkVirtualTrackingDevice.h"
 
 namespace mitk {
   ctkPluginContext* org_mbi_gui_qt_usnavigation_Activator::m_Context = 0;
 
   void org_mbi_gui_qt_usnavigation_Activator::start(ctkPluginContext* context)
   {
     m_Context = context;
 
     //BERRY_REGISTER_EXTENSION_CLASS(USNavigation, context)
     BERRY_REGISTER_EXTENSION_CLASS(UltrasoundCalibration, context)
       BERRY_REGISTER_EXTENSION_CLASS(USNavigationMarkerPlacement, context)
       BERRY_REGISTER_EXTENSION_CLASS(QmitkUSNavigationPerspective, context)
 
       // create a combined modality persitence object for loading and storing
       // combined modality objects persistently
       m_USCombinedModalityPersistence = mitk::USNavigationCombinedModalityPersistence::New();
   }
 
   void org_mbi_gui_qt_usnavigation_Activator::stop(ctkPluginContext* context)
   {
     m_USCombinedModalityPersistence = 0;
 
     m_Context = 0;
 
     Q_UNUSED(context)
   }
 
   ctkPluginContext *org_mbi_gui_qt_usnavigation_Activator::GetContext()
   {
     return m_Context;
   }
 }
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(org_mbi_gui_qt_usnavigation, mitk::org_mbi_gui_qt_usnavigation_Activator)
+Q_EXPORT_PLUGIN2(org_mitk_gui_qt_igt_app_echotrack, mitk::org_mbi_gui_qt_usnavigation_Activator)
 #endif
 
 // necessary for us::GetModuleContext() in USNavigationCombinedModalityPersistence
 // (see: https://www.mail-archive.com/mitk-users@lists.sourceforge.net/msg04421.html)
 US_INITIALIZE_MODULE