diff --git a/CMakeLists.txt b/CMakeLists.txt
index c898f06e9..489f67e7f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,6 +238,13 @@ if(ENABLE_VIDEO)
 endif()
 
 
+if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+	set(EXPORT_TARGETS_NAME "LinphoneBuilder")
+else()
+	set(EXPORT_TARGETS_NAME "Linphone")
+endif()
+
+
 add_subdirectory(coreapi)
 add_subdirectory(share)
 if(ENABLE_CONSOLE_UI)
@@ -262,9 +269,8 @@ write_basic_package_version_file(
 	VERSION ${LINPHONE_VERSION}
 	COMPATIBILITY AnyNewerVersion
 )
-export(EXPORT LinphoneTargets
+export(EXPORT ${EXPORT_TARGETS_NAME}Targets
 	FILE "${CMAKE_CURRENT_BINARY_DIR}/LinphoneTargets.cmake"
-	NAMESPACE BelledonneCommunications::
 )
 configure_file(cmake/LinphoneConfig.cmake.in
 	"${CMAKE_CURRENT_BINARY_DIR}/LinphoneConfig.cmake"
@@ -272,9 +278,8 @@ configure_file(cmake/LinphoneConfig.cmake.in
 )
 
 set(ConfigPackageLocation lib/cmake/Linphone)
-install(EXPORT LinphoneTargets
+install(EXPORT ${EXPORT_TARGETS_NAME}Targets
 	FILE LinphoneTargets.cmake
-	NAMESPACE BelledonneCommunications::
 	DESTINATION ${ConfigPackageLocation}
 )
 install(FILES
diff --git a/cmake/LinphoneConfig.cmake.in b/cmake/LinphoneConfig.cmake.in
index b29fe8836..9bcd9dfa4 100644
--- a/cmake/LinphoneConfig.cmake.in
+++ b/cmake/LinphoneConfig.cmake.in
@@ -41,7 +41,7 @@ endif()
 
 get_filename_component(LINPHONE_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 set(LINPHONE_INCLUDE_DIRS "${LINPHONE_CMAKE_DIR}/../../../include")
-set(LINPHONE_LIBRARIES BelledonneCommunications::linphone)
+set(LINPHONE_LIBRARIES linphone)
 set(LINPHONE_LDFLAGS @LINK_FLAGS@)
 list(APPEND LINPHONE_INCLUDE_DIRS ${MEDIASTREAMER2_INCLUDE_DIRS} ${BELLESIP_INCLUDE_DIRS})
 list(APPEND LINPHONE_LIBRARIES ${MEDIASTREAMER2_LIBRARIES} ${BELLESIP_LIBRARIES})
diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index 6689f383a..f2cf17e0a 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -188,7 +188,7 @@ if(ICONV_FOUND)
 	endif()
 endif()
 
-install(TARGETS linphone EXPORT LinphoneTargets
+install(TARGETS linphone EXPORT ${EXPORT_TARGETS_NAME}Targets
 	RUNTIME DESTINATION bin
 	LIBRARY DESTINATION lib
 	ARCHIVE DESTINATION lib