diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad3f2e766e224fa0a89055c6648c3dc81ed2a279..49db2de8d042cb7d18743d35effe710492596ebe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,14 +164,15 @@ IF(DD4HEP_USE_EXISTING_DD4HEP)
     dd4hep_print("|> Building ${DDPackage}")
     add_subdirectory(${DDPackage})
   ENDFOREACH()
-
-
+  LIST(GET DD4HEP_BUILD_PACKAGES 0 DD4HEP_SELECTED_PACKAGE)
 ELSE()
 
 include(DD4hep_XML_setup)
 
 #These pacakges are mandatory
+SET(DD4HEP_SELECTED_PACKAGE DDCore)
 FOREACH(DDPackage GaudiPluginService DDParsers DDCore)
+  dd4hep_print("|> Building ${DDPackage}")
   add_subdirectory(${DDPackage})
 ENDFOREACH()
 
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 72abed33c8ad06aebdf78e3f7c0bba9c9517a9ff..ef997b8a83ef429c0bddf70e2f7c0515263a2374 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -73,18 +73,18 @@ if(NOT CMAKE_PROJECT_NAME STREQUAL @CMAKE_PROJECT_NAME@)
 endif()
 
 # Backward compatible @CMAKE_PROJECT_NAME@_INCLUDE_DIRS and @CMAKE_PROJECT_NAME@_LIBRARIES variables
-GET_TARGET_PROPERTY(@CMAKE_PROJECT_NAME@_INCLUDE_DIRS @CMAKE_PROJECT_NAME@::DDCore INTERFACE_INCLUDE_DIRECTORIES)
-set(@CMAKE_PROJECT_NAME@_LIBRARIES @CMAKE_PROJECT_NAME@::DDCore)
+GET_TARGET_PROPERTY(@CMAKE_PROJECT_NAME@_INCLUDE_DIRS DD4hep::@DD4HEP_SELECTED_PACKAGE@ INTERFACE_INCLUDE_DIRECTORIES)
+set(@CMAKE_PROJECT_NAME@_LIBRARIES DD4hep::@DD4HEP_SELECTED_PACKAGE@)
 
 # Backward compatible @CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES variable
 SET(@CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES)
 IF(@CMAKE_PROJECT_NAME@_FIND_COMPONENTS)
   dd4hep_print( "|++> @CMAKE_PROJECT_NAME@: Looking for Components: ${@CMAKE_PROJECT_NAME@_FIND_COMPONENTS}" )
   FOREACH(comp ${@CMAKE_PROJECT_NAME@_FIND_COMPONENTS})
-    IF(NOT TARGET @CMAKE_PROJECT_NAME@::${comp})
+    IF(NOT TARGET DD4hep::${comp})
       MESSAGE(FATAL_ERROR "|++> Did not find required component: ${comp}")
     ENDIF()
-    LIST(APPEND @CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES @CMAKE_PROJECT_NAME@::${comp})
+    LIST(APPEND @CMAKE_PROJECT_NAME@_COMPONENT_LIBRARIES DD4hep::${comp})
   ENDFOREACH()
 ENDIF()