diff --git a/CMakeExternals/ACVD.cmake b/CMakeExternals/ACVD.cmake
index 787b50a8c1..0210d98763 100644
--- a/CMakeExternals/ACVD.cmake
+++ b/CMakeExternals/ACVD.cmake
@@ -1,42 +1,42 @@
 #-----------------------------------------------------------------------------
 # ACVD
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_ACVD)
   # Sanity checks
   if(DEFINED ACVD_DIR AND NOT EXISTS ${ACVD_DIR})
     message(FATAL_ERROR "ACVD_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj ACVD)
   set(proj_DEPENDENCIES VTK)
   set(ACVD_DEPENDS ${proj})
 
   set(additional_cmake_args
     -DUSE_MULTITHREADING:BOOL=ON
     -DVTK_DIR:PATH=${VTK_DIR}
   )
 
   set(ACVD_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchACVD.cmake)
 
   if(NOT DEFINED ACVD_DIR)
     ExternalProject_Add(${proj}
       SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL http://mitk.org/download/thirdparty/ACVD_VTK6.tar.gz
       URL_MD5 e99d1cb7d264d421074d5346f1d3ce82
       PATCH_COMMAND ${ACVD_PATCH_COMMAND}
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${additional_cmake_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
     set(ACVD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
   else()
-    mitkMacroEmptyExternalProject(${proj} "${proj}_DEPENDENCIES}")
+    mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
   endif()
 endif()
diff --git a/CMakeExternals/SOFA.cmake b/CMakeExternals/SOFA.cmake
index 0012fdf20f..997471941f 100644
--- a/CMakeExternals/SOFA.cmake
+++ b/CMakeExternals/SOFA.cmake
@@ -1,89 +1,89 @@
 #-----------------------------------------------------------------------------
 # SOFA
 #-----------------------------------------------------------------------------
 
 if(MITK_USE_SOFA)
   # Sanity checks
   if(DEFINED SOFA_DIR AND NOT EXISTS ${SOFA_DIR})
     message(FATAL_ERROR "SOFA_DIR variable is defined but corresponds to non-existing directory")
   endif()
 
   set(proj SOFA)
   set(proj_DEPENDENCIES Boost GLEW)
   set(SOFA_DEPENDS ${proj})
 
   set(additional_cmake_args
     -DGLEW_DIR:PATH=${GLEW_DIR}
     -DSOFA-EXTERNAL_BOOST_PATH:PATH=${CMAKE_BINARY_DIR}/Boost-install/lib
     -DSOFA-EXTERNAL_HAVE_BOOST:BOOL=ON
     -DSOFA-EXTERNAL_HAVE_GLEW:BOOL=ON
     -DSOFA-EXTERNAL_HAVE_ZLIB:BOOL=OFF
     -DSOFA-EXTERNAL_HAVE_PNG:BOOL=OFF
     -DSOFA-LIB_GUI_GLUT:BOOL=OFF
     -DSOFA-LIB_GUI_QTVIEWER:BOOL=OFF
   )
 
   if(NOT APPLE)
     list(APPEND proj_DEPENDENCIES GLUT)
 
     list(APPEND additional_cmake_args
       -DGLUT_DIR:PATH=${GLUT_DIR}
       -DSOFA-EXTERNAL_HAVE_FREEGLUT:BOOL=ON
     )
   endif()
 
   set(preconfigure_cmake_args
     -DSOFA-APPLICATION_MODELER:BOOL=OFF
     -DSOFA-APPLICATION_RUNSOFA:BOOL=OFF
     -DSOFA-APPLICATION_SOFABATCH:BOOL=OFF
     -DSOFA-TUTORIAL_CHAIN_HYBRID:BOOL=OFF
     -DSOFA-TUTORIAL_COMPOSITE_OBJECT:BOOL=OFF
     -DSOFA-TUTORIAL_MIXED_PENDULUM:BOOL=OFF
     -DSOFA-TUTORIAL_ONE_PARTICLE:BOOL=OFF
     -DSOFA-TUTORIAL_ONE_TETRAHEDRON:BOOL=OFF
   )
 
   if(NOT MITK_USE_SYSTEM_Boost)
     set(boost_cmake_args
       -DBoost_NO_SYSTEM_PATHS:BOOL=ON
       -DBOOST_INCLUDEDIR:PATH=${CMAKE_BINARY_DIR}/Boost-install/include
       -DBOOST_LIBRARYDIR:PATH=${CMAKE_BINARY_DIR}/Boost-install/lib
       -DBoost_ADDITIONAL_VERSIONS:STRING=1.54
     )
   endif()
 
   set(rev "9832")
 
   set(SOFA_PATCH_COMMAND ${CMAKE_COMMAND} -DTEMPLATE_FILE:FILEPATH=${MITK_SOURCE_DIR}/CMakeExternals/EmptyFileForPatching.dummy -P ${MITK_SOURCE_DIR}/CMakeExternals/PatchSOFA-rev${rev}.cmake)
   set(SOFA_PRECONFIGURE_COMMAND ${CMAKE_COMMAND} -G${gen} ${ep_common_args} ${preconfigure_cmake_args} ${boost_cmake_args} ${CMAKE_BINARY_DIR}/${proj}-src)
 
   if(NOT DEFINED SOFA_DIR)
     ExternalProject_Add(${proj}
       SOURCE_DIR ${CMAKE_BINARY_DIR}/${proj}-src
       BINARY_DIR ${proj}-build
       PREFIX ${proj}-cmake
       URL http://mitk.org/download/thirdparty/SOFA-rev${rev}.tar.gz
       URL_MD5 ff65b2813dcc27755844f95cb0392bcf
       PATCH_COMMAND ${SOFA_PATCH_COMMAND}
       INSTALL_COMMAND ""
       CMAKE_GENERATOR ${gen}
       CMAKE_ARGS
         ${ep_common_args}
         ${additional_cmake_args}
         ${boost_cmake_args}
       DEPENDS ${proj_DEPENDENCIES}
     )
 
     ExternalProject_Add_Step(${proj} preconfigure
       COMMAND ${SOFA_PRECONFIGURE_COMMAND}
       WORKING_DIRECTORY ${proj}-build
       DEPENDEES patch
       DEPENDERS configure
       LOG 1
     )
 
     set(SOFA_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
   else()
-    mitkMacroEmptyExternalProject(${proj} "${proj}_DEPENDENCIES}")
+    mitkMacroEmptyExternalProject(${proj} "${proj_DEPENDENCIES}")
   endif()
 endif()