diff --git a/Core/Code/CMakeLists.txt b/Core/Code/CMakeLists.txt
index 9a7c5be1f7..143b6c6423 100644
--- a/Core/Code/CMakeLists.txt
+++ b/Core/Code/CMakeLists.txt
@@ -1,60 +1,60 @@
 
 set(TOOL_CPPS "")
 
 # temporary suppress warnings in the following files until image accessors are fully integrated.
 set_source_files_properties( DataManagement/mitkImage.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS )
 set_source_files_properties( Controllers/mitkSliceNavigationController.cpp COMPILE_FLAGS -DMITK_NO_DEPRECATED_WARNINGS )
 
 # In MITK_ITK_Config.cmake, we set ITK_NO_IO_FACTORY_REGISTER_MANAGER to 1 unless
 # the variable is already defined. Setting it to 1 prevents multiple registrations/
 # unregistrations of ITK IO factories during library loading/unloading (of MITK
 # libraries). However, we need "one" place where the IO factories are registered at
 # least once. This could be the application executable, but every executable would
 # need to take care of that itself. Instead, we allow the auto registration in the
 # Mitk Core library.
 set(ITK_NO_IO_FACTORY_REGISTER_MANAGER 0)
 
 MITK_CREATE_MODULE(Core
   INCLUDE_DIRS
     Algorithms Common DataManagement Controllers
     Interactions Interfaces IO Rendering ${MITK_BINARY_DIR}
   INTERNAL_INCLUDE_DIRS
     ${OPENGL_INCLUDE_DIR}
   DEPENDS mbilog CppMicroServices
   PACKAGE_DEPENDS tinyxml GDCM
                   ITK|ITKTransform+ITKImageGrid+ITKImageFeature+ITKTestKernel+ITKIORAW
                   VTK|vtkFiltersTexture+vtkFiltersParallel+vtkImagingStencil+vtkImagingMath+vtkInteractionStyle+vtkRenderingOpenGL+vtkRenderingFreeTypeOpenGL+vtkRenderingLabel+vtkInteractionWidgets+vtkIOGeometry+vtkIOXML
                   OpenGL
   EXPORT_DEFINE MITK_CORE_EXPORT
   WARNINGS_AS_ERRORS
   # Do not automatically create CppMicroServices initialization code.
   # Because the VTK 6 "auto-init" functionality injects file-local static
   # initialization code in every cpp file which includes a VTK header,
   # static initialization order becomes an issue again. For the Mitk
   # core library, we need to ensure that the VTK static initialization stuff
   # happens before the CppMicroServices initialization, since the latter
   # might already use VTK code which needs to access VTK object factories.
   # Hence, CppMicroServices initialization code is placed manually within
   # the mitkCoreActivator.cpp file.
   NO_INIT
 )
 
 # this is needed for libraries which link to Mitk and need
 # symbols from explicitly instantiated templates
 if(MINGW)
-  get_target_property(_mitkCore_MINGW_linkflags Mitk LINK_FLAGS)
+  get_target_property(_mitkCore_MINGW_linkflags ${MODULE_TARGET} LINK_FLAGS)
   if(NOT _mitkCore_MINGW_linkflags)
     set(_mitkCore_MINGW_linkflags "")
   endif(NOT _mitkCore_MINGW_linkflags)
   set_target_properties(${MODULE_TARGET} PROPERTIES LINK_FLAGS "${_mitkCore_MINGW_linkflags} -Wl,--export-all-symbols")
 endif(MINGW)
 
 if(MSVC_IDE OR MSVC_VERSION OR MINGW)
-  target_link_libraries(Mitk psapi.lib)
+  target_link_libraries(${MODULE_TARGET} psapi.lib)
 endif(MSVC_IDE OR MSVC_VERSION OR MINGW)
 
 # build tests?
 if(BUILD_TESTING)
   add_subdirectory(TestingHelper)
   add_subdirectory(Testing)
 ENDIF()