diff --git a/CMake/ctkFunctionGenerateDGraphInput.cmake b/CMake/ctkFunctionGenerateDGraphInput.cmake
index 85a24e95fe..dc8d056549 100644
--- a/CMake/ctkFunctionGenerateDGraphInput.cmake
+++ b/CMake/ctkFunctionGenerateDGraphInput.cmake
@@ -83,7 +83,7 @@ FUNCTION(ctkFunctionGenerateDGraphInput dir target_directories)
         SET(ctk_dependencies ${dependencies})
       ELSE()
         # filter dependencies starting with CTK org org_commontk_
-        ctkMacroGetAllCTKTargetLibraries("${dependencies}" ctk_dependencies)
+        ctkMacroGetAllProjectTargetLibraries("${dependencies}" ctk_dependencies)
       ENDIF()
 
       IF(ctk_dependencies)
diff --git a/CMake/ctkFunctionGenerateProjectXml.cmake b/CMake/ctkFunctionGenerateProjectXml.cmake
index bdcedf527e..779e442df9 100644
--- a/CMake/ctkFunctionGenerateProjectXml.cmake
+++ b/CMake/ctkFunctionGenerateProjectXml.cmake
@@ -78,7 +78,7 @@ FUNCTION(ctkFunctionGenerateProjectXml dir name target_directories is_superbuild
       SET(ctk_dependencies)
 
       # filter dependencies starting with CTK
-      ctkMacroGetAllCTKTargetLibraries("${dependencies}" ctk_dependencies)
+      ctkMacroGetAllProjectTargetLibraries("${dependencies}" ctk_dependencies)
 
       IF(${is_superbuild})
         SET(xml_subprojects ${xml_subprojects} "    <Dependency name=\"SuperBuild\"/>\n")
diff --git a/CMake/ctkFunctionGetIncludeDirs.cmake b/CMake/ctkFunctionGetIncludeDirs.cmake
index 7bf36806bc..3d00a097cf 100644
--- a/CMake/ctkFunctionGetIncludeDirs.cmake
+++ b/CMake/ctkFunctionGetIncludeDirs.cmake
@@ -35,8 +35,8 @@ FUNCTION(ctkFunctionGetIncludeDirs var_include_dirs)
     SET(ctk_deps )
     SET(ext_deps )
 
-    ctkMacroGetAllCTKTargetLibraries("${${_target}_DEPENDENCIES}" ctk_deps)
-    ctkMacroGetAllNonCTKTargetLibraries("${${_target}_DEPENDENCIES}" ext_deps)
+    ctkMacroGetAllProjectTargetLibraries("${${_target}_DEPENDENCIES}" ctk_deps)
+    ctkMacroGetAllNonProjectTargetLibraries("${${_target}_DEPENDENCIES}" ext_deps)
 
     FOREACH(dep ${ctk_deps})
       LIST(APPEND _include_dirs
diff --git a/CMake/ctkFunctionGetLibraryDirs.cmake b/CMake/ctkFunctionGetLibraryDirs.cmake
index 26eab6c85d..965d69bc78 100644
--- a/CMake/ctkFunctionGetLibraryDirs.cmake
+++ b/CMake/ctkFunctionGetLibraryDirs.cmake
@@ -34,7 +34,7 @@ FUNCTION(ctkFunctionGetLibraryDirs var_library_dirs)
 
     SET(ext_deps )
 
-    ctkMacroGetAllNonCTKTargetLibraries("${${_target}_DEPENDENCIES}" ext_deps)
+    ctkMacroGetAllNonProjectTargetLibraries("${${_target}_DEPENDENCIES}" ext_deps)
     
     FOREACH(dep ${ext_deps})
 
diff --git a/CMake/ctkMacroTargetLibraries.cmake b/CMake/ctkMacroTargetLibraries.cmake
index 6f3c9fb569..fa85019e3b 100644
--- a/CMake/ctkMacroTargetLibraries.cmake
+++ b/CMake/ctkMacroTargetLibraries.cmake
@@ -195,27 +195,32 @@ MACRO(ctkMacroCollectAllTargetLibraries targets subdir varname)
 ENDMACRO()
 
 #
-# Extract all library names starting with CTK uppercase or org_commontk_
-#
-MACRO(ctkMacroGetAllCTKTargetLibraries all_target_libraries varname)
-  SET(re_ctklib "^(c|C)(t|T)(k|K)[a-zA-Z0-9]+$")
-  SET(re_ctkplugin "^org_commontk_[a-zA-Z0-9_]+$")
-  SET(_tmp_list)
-  LIST(APPEND _tmp_list ${all_target_libraries})
-  #MESSAGE("calling ctkMacroListFilter with varname:${varname}")
-  ctkMacroListFilter(_tmp_list re_ctklib re_ctkplugin OUTPUT_VARIABLE ${varname})
-  #MESSAGE(STATUS "getallctklibs from ${all_target_libraries}")
-  #MESSAGE(STATUS varname:${varname}:${${varname}})
+# Extract all library names which are build within this project
+#
+MACRO(ctkMacroGetAllProjectTargetLibraries all_target_libraries varname)
+  # Allow external projects to override the set of internal targets
+  IF(COMMAND GetMyTargetLibraries)
+    GetMyTargetLibraries("${all_target_libraries}" ${varname})
+  ELSE()
+    SET(re_ctklib "^(c|C)(t|T)(k|K)[a-zA-Z0-9]+$")
+    SET(re_ctkplugin "^org_commontk_[a-zA-Z0-9_]+$")
+    SET(_tmp_list)
+    LIST(APPEND _tmp_list ${all_target_libraries})
+    #MESSAGE("calling ctkMacroListFilter with varname:${varname}")
+    ctkMacroListFilter(_tmp_list re_ctklib re_ctkplugin OUTPUT_VARIABLE ${varname})
+    #MESSAGE(STATUS "getallctklibs from ${all_target_libraries}")
+    #MESSAGE(STATUS varname:${varname}:${${varname}})
+  ENDIF()
 ENDMACRO()
 
 #
-# Extract all library names *NOT* starting with CTK uppercase or org_commontk_
+# Extract all library names *NOT* being build within this project
 #
-MACRO(ctkMacroGetAllNonCTKTargetLibraries all_target_libraries varname)
-  ctkMacroGetAllCTKTargetLibraries("${all_target_libraries}" all_ctk_libraries)
+MACRO(ctkMacroGetAllNonProjectTargetLibraries all_target_libraries varname)
+  ctkMacroGetAllProjectTargetLibraries("${all_target_libraries}" all_project_libraries)
   SET(_tmp_list ${all_target_libraries})
-  IF(all_ctk_libraries)
-    LIST(REMOVE_ITEM _tmp_list ${all_ctk_libraries})
+  IF(all_project_libraries)
+    LIST(REMOVE_ITEM _tmp_list ${all_project_libraries})
   ENDIF()
   SET(${varname} ${_tmp_list})
   #MESSAGE(STATUS varname:${varname}:${${varname}})
diff --git a/CMake/ctkMacroValidateBuildOptions.cmake b/CMake/ctkMacroValidateBuildOptions.cmake
index af8eb584b4..514a9abb6e 100644
--- a/CMake/ctkMacroValidateBuildOptions.cmake
+++ b/CMake/ctkMacroValidateBuildOptions.cmake
@@ -157,12 +157,7 @@ MACRO(ctkMacroValidateBuildOptions dir executable target_directories)
       # Check if all internal CTK targets included in the dependency path are enabled
       SET(int_dep_path_list )
       SET(ext_dep_path_list ${dep_path_list})
-      # Allow external projects to override the set of internal targets
-      IF(COMMAND GetMyTargetLibraries)
-        GetMyTargetLibraries("${dep_path_list}" int_dep_path_list)
-      ELSE()
-        ctkMacroGetAllCTKTargetLibraries("${dep_path_list}" int_dep_path_list)
-      ENDIF()
+      ctkMacroGetAllProjectTargetLibraries("${dep_path_list}" int_dep_path_list)
       IF(int_dep_path_list)
         LIST(REMOVE_ITEM ext_dep_path_list ${int_dep_path_list})
       ENDIF()
diff --git a/SuperBuild.cmake b/SuperBuild.cmake
index 18ed1224ec..8c75666286 100644
--- a/SuperBuild.cmake
+++ b/SuperBuild.cmake
@@ -100,7 +100,7 @@ ctkMacroCollectAllTargetLibraries("${CTK_APPLICATIONS_SUBDIRS}" "Applications" A
 # Using the variable ALL_TARGET_LIBRARIES initialized above with the help
 # of the macro ctkMacroCollectAllTargetLibraries, let's get the list of all Non-CTK dependencies.
 # NON_CTK_DEPENDENCIES is expected by the macro ctkMacroShouldAddExternalProject
-ctkMacroGetAllNonCTKTargetLibraries("${ALL_TARGET_LIBRARIES}" NON_CTK_DEPENDENCIES)
+ctkMacroGetAllNonProjectTargetLibraries("${ALL_TARGET_LIBRARIES}" NON_CTK_DEPENDENCIES)
 #MESSAGE(STATUS NON_CTK_DEPENDENCIES:${NON_CTK_DEPENDENCIES})
 
 #-----------------------------------------------------------------------------