diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt
index 2ec32a298..7eb6af309 100644
--- a/code/ryzom/server/src/admin_modules/CMakeLists.txt
+++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt
@@ -1,14 +1,14 @@
 FILE(GLOB SRC *.cpp *.h)
 
-NL_TARGET_LIB(admin_modules ${SRC})
+NL_TARGET_LIB(ryzom_adminmodules ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-TARGET_LINK_LIBRARIES(admin_modules nelmisc)
-SET_TARGET_PROPERTIES(admin_modules PROPERTIES VERSION ${NL_VERSION})
 
-NL_DEFAULT_PROPS(admin_modules "Ryzom, Library: Service Admin Modules")
-NL_ADD_LIB_SUFFIX(admin_modules)
+TARGET_LINK_LIBRARIES(ryzom_adminmodules nelmisc nelnet)
+NL_DEFAULT_PROPS(ryzom_adminmodules "Ryzom, Library: Service Admin Modules")
+NL_ADD_RUNTIME_FLAGS(ryzom_adminmodules)
+NL_ADD_LIB_SUFFIX(ryzom_adminmodules)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS admin_modules LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+INSTALL(TARGETS ryzom_adminmodules LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/ryzom/server/src/ai_service/CMakeLists.txt b/code/ryzom/server/src/ai_service/CMakeLists.txt
index bbf1a20be..759ba58e4 100644
--- a/code/ryzom/server/src/ai_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_service/CMakeLists.txt
@@ -1,6 +1,7 @@
 FILE(GLOB SRC *.cpp *.h)
 
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id.cpp
+LIST(REMOVE_ITEM SRC
+			${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id.h
 			${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id_inline.h
 			${CMAKE_CURRENT_SOURCE_DIR}/ai_world_map.cpp
@@ -12,30 +13,31 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ai_entity_id.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_interface.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_interface.h)
 
-ADD_EXECUTABLE(ai_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_ai_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ai_service	admin_modules 
-					ryzom_gameshare 
-					server_share
-					ai_share
-					${PLATFORM_LINKFLAGS} 
-					${LIBXML2_LIBRARIES} 
-					${MYSQL_LIBRARIES} 
-					${ZLIB_LIBRARIES} 
+TARGET_LINK_LIBRARIES(ryzom_ai_service
+					ryzom_adminmodules
+					ryzom_gameshare
+					ryzom_servershare
+					ryzom_aishare
+					${PLATFORM_LINKFLAGS}
+					${LIBXML2_LIBRARIES}
+					${MYSQL_LIBRARIES}
+					${ZLIB_LIBRARIES}
 					nelmisc
 					nelnet
 					nelgeorges
 					nelligo)
 
-NL_DEFAULT_PROPS(ai_service "Ryzom, Services: AI Service (AIS)")
-NL_ADD_RUNTIME_FLAGS(ai_service)
+NL_DEFAULT_PROPS(ryzom_ai_service "Ryzom, Services: AI Service (AIS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_ai_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(ai_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_ai_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS ai_service RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS ryzom_ai_service RUNTIME DESTINATION sbin COMPONENT services)
 
diff --git a/code/ryzom/server/src/ai_share/CMakeLists.txt b/code/ryzom/server/src/ai_share/CMakeLists.txt
index b669bfc45..67f659109 100644
--- a/code/ryzom/server/src/ai_share/CMakeLists.txt
+++ b/code/ryzom/server/src/ai_share/CMakeLists.txt
@@ -1,17 +1,25 @@
 FILE(GLOB SRC *.cpp *.h)
 
-NL_TARGET_LIB(ai_share ${SRC})
+NL_TARGET_LIB(ryzom_aishare ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare server_share nelmisc nelnet nelgeorges nelpacs)
 
-NL_DEFAULT_PROPS(ai_share "Ryzom, Library: AI Shared")
-NL_ADD_LIB_SUFFIX(ai_share)
+TARGET_LINK_LIBRARIES(ryzom_aishare
+						ryzom_gameshare
+						ryzom_servershare
+						nelmisc
+						nelnet
+						nelgeorges
+						nelpacs)
+
+NL_DEFAULT_PROPS(ryzom_aishare "Ryzom, Library: AI Shared")
+NL_ADD_RUNTIME_FLAGS(ryzom_aishare)
+NL_ADD_LIB_SUFFIX(ryzom_aishare)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(ai_share ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_aishare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS ai_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+INSTALL(TARGETS ryzom_aishare LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/ryzom/server/src/backup_service/CMakeLists.txt b/code/ryzom/server/src/backup_service/CMakeLists.txt
index d160ce43d..b388132f2 100644
--- a/code/ryzom/server/src/backup_service/CMakeLists.txt
+++ b/code/ryzom/server/src/backup_service/CMakeLists.txt
@@ -1,23 +1,24 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(backup_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_backup_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(backup_service	admin_modules 
-					ryzom_gameshare 
-					server_share
-					${PLATFORM_LINKFLAGS} 
-					${LIBXML2_LIBRARIES} 
-					${ZLIB_LIBRARIES} 
+
+TARGET_LINK_LIBRARIES(ryzom_backup_service
+					ryzom_adminmodules
+					ryzom_gameshare
+					ryzom_servershare
+					${PLATFORM_LINKFLAGS}
+					${LIBXML2_LIBRARIES}
+					${ZLIB_LIBRARIES}
 					nelmisc 
 					nelnet
 					nelgeorges
 					nelligo)
 					
-NL_DEFAULT_PROPS(backup_service "Ryzom, Services: Backup Service (BS)")
-NL_ADD_RUNTIME_FLAGS(backup_service)
+NL_DEFAULT_PROPS(ryzom_backup_service "Ryzom, Services: Backup Service (BS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_backup_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS backup_service RUNTIME DESTINATION sbin COMPONENT services)
-
+INSTALL(TARGETS ryzom_backup_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
index 60c0d15f7..350464951 100644
--- a/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
+++ b/code/ryzom/server/src/dynamic_scenario_service/CMakeLists.txt
@@ -2,25 +2,26 @@ FILE(GLOB SRC *.cpp *.h)
 
 LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOURCE_DIR}/service.h)
 
-ADD_EXECUTABLE(dynamic_scenario_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_dynamic_scenario_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(dynamic_scenario_service	admin_modules 
-						ryzom_gameshare 
-						server_share
-						ai_share
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
-						${ZLIB_LIBRARIES} 
-						nelmisc 
+
+TARGET_LINK_LIBRARIES(ryzom_dynamic_scenario_service
+						ryzom_adminmodules
+						ryzom_gameshare
+						ryzom_servershare
+						ryzom_aishare
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						${ZLIB_LIBRARIES}
+						nelmisc
 						nelnet
 						nelgeorges
 						nelligo)
 
-NL_DEFAULT_PROPS(dynamic_scenario_service "Ryzom, Services: Dynamic Scenario Service (DSS)")
-NL_ADD_RUNTIME_FLAGS(dynamic_scenario_service)
+NL_DEFAULT_PROPS(ryzom_dynamic_scenario_service "Ryzom, Services: Dynamic Scenario Service (DSS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_dynamic_scenario_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS dynamic_scenario_service RUNTIME DESTINATION sbin COMPONENT services)
-
+INSTALL(TARGETS ryzom_dynamic_scenario_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/entities_game_service/CMakeLists.txt b/code/ryzom/server/src/entities_game_service/CMakeLists.txt
index 8f50890a2..5901c566e 100644
--- a/code/ryzom/server/src/entities_game_service/CMakeLists.txt
+++ b/code/ryzom/server/src/entities_game_service/CMakeLists.txt
@@ -20,7 +20,8 @@ FILE(GLOB SRC	*.cpp *.h
 		stables/*.h stables/*.cpp
 		team_manager/*.h team_manager/*.cpp)
 
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp
+LIST(REMOVE_ITEM SRC
+			${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.h
 			${CMAKE_CURRENT_SOURCE_DIR}/egs_static_continent.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/egs_static_continent.h
@@ -40,15 +41,17 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ai_pet_interface.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/shop_type/solded_items.h)
 
-ADD_EXECUTABLE(entities_game_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_entities_game_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(entities_game_service	admin_modules 
-						ryzom_gameshare 
-						server_share 
-						ai_share 
-						pd_lib 
-						gameplay_module_lib
+
+TARGET_LINK_LIBRARIES(ryzom_entities_game_service
+						ryzom_adminmodules
+						ryzom_gameshare
+						ryzom_servershare
+						ryzom_aishare
+						ryzom_pd
+						ryzom_gameplaymodule
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						${MYSQL_LIBRARIES} 
@@ -58,14 +61,13 @@ TARGET_LINK_LIBRARIES(entities_game_service	admin_modules
 						nelgeorges
 						nelligo)
 
-NL_DEFAULT_PROPS(entities_game_service "Ryzom, Services: Entities Game Service (EGS)")
-NL_ADD_RUNTIME_FLAGS(entities_game_service)
+NL_DEFAULT_PROPS(ryzom_entities_game_service "Ryzom, Services: Entities Game Service (EGS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_entities_game_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(entities_game_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_entities_game_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS entities_game_service RUNTIME DESTINATION sbin COMPONENT services)
-
+INSTALL(TARGETS ryzom_entities_game_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/entity_view_service/CMakeLists.txt b/code/ryzom/server/src/entity_view_service/CMakeLists.txt
index 21f4fcb9c..9b34f1fe0 100644
--- a/code/ryzom/server/src/entity_view_service/CMakeLists.txt
+++ b/code/ryzom/server/src/entity_view_service/CMakeLists.txt
@@ -2,26 +2,27 @@ FILE(GLOB SRC *.cpp *.h)
 
 #LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/service.cpp ${CMAKE_CURRENT_SOURCE_DIR}/service.h)
 
-ADD_EXECUTABLE(entity_view_service ${SRC})
-
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(entity_view_service	admin_modules 
-						ryzom_gameshare 
-						server_share
-						ai_share
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
-						${ZLIB_LIBRARIES} 
-						${NELMISC_LIBRARY} 
-						${NELNET_LIBRARY} 
-						${NELGEORGES_LIBRARY} 
-						${NELLIGO_LIBRARY})
-IF(WIN32)
-  SET_TARGET_PROPERTIES(entity_view_service PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: Entity View Service (EVS)")
-ENDIF(WIN32)
+ADD_EXECUTABLE(ryzom_entity_view_service ${SRC})
+
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(ryzom_entity_view_service
+						ryzom_adminmodules
+						ryzom_gameshare
+						ryzom_servershare
+						ryzom_aishare
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						${ZLIB_LIBRARIES}
+						nelmisc
+						nelnet
+						nelgeorges
+						nelligo)
+
+NL_DEFAULT_PROPS(ryzom_entity_view_service "Ryzom, Services: Entity View Service (EVS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_entity_view_service)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS entity_view_service RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS ryzom_entity_view_service RUNTIME DESTINATION sbin COMPONENT services)
 
diff --git a/code/ryzom/server/src/frontend_service/CMakeLists.txt b/code/ryzom/server/src/frontend_service/CMakeLists.txt
index bcbd38ea3..563e94f7a 100644
--- a/code/ryzom/server/src/frontend_service/CMakeLists.txt
+++ b/code/ryzom/server/src/frontend_service/CMakeLists.txt
@@ -1,25 +1,36 @@
 FILE(GLOB SRC *.cpp *.h)
 
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/pair_selector.cpp
+LIST(REMOVE_ITEM SRC
+			${CMAKE_CURRENT_SOURCE_DIR}/pair_selector.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/pair_selector.h
 			${CMAKE_CURRENT_SOURCE_DIR}/prioritizer.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/prioritizer.h
 			${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/property_dispatcher.h)
 
-ADD_EXECUTABLE(frontend_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_frontend_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(frontend_service admin_modules ryzom_gameshare ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES} nelmisc nelnet nelgeorges nelligo)
 
-NL_DEFAULT_PROPS(frontend_service "Ryzom, Services: Frontend Service (FS)")
-NL_ADD_RUNTIME_FLAGS(frontend_service)
+TARGET_LINK_LIBRARIES(ryzom_frontend_service
+						ryzom_adminmodules
+						ryzom_gameshare
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						${MYSQL_LIBRARIES}
+						${ZLIB_LIBRARIES}
+						nelmisc
+						nelnet
+						nelgeorges
+						nelligo)
+
+NL_DEFAULT_PROPS(ryzom_frontend_service "Ryzom, Services: Frontend Service (FS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_frontend_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(frontend_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_frontend_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS frontend_service RUNTIME DESTINATION sbin COMPONENT services)
-
+INSTALL(TARGETS ryzom_frontend_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
index 3db43b861..f1cb46d0d 100644
--- a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
+++ b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
@@ -1,6 +1,7 @@
 FILE(GLOB SRC *.cpp *.h)
 
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ec_event_chat.cpp
+LIST(REMOVE_ITEM SRC
+			${CMAKE_CURRENT_SOURCE_DIR}/ec_event_chat.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/gus_mfc_popups.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/gus_mfc_popups.h
 			${CMAKE_CURRENT_SOURCE_DIR}/gus_mfc_select_with_text.cpp
@@ -12,27 +13,26 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/ec_event_chat.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp)
 
-ADD_EXECUTABLE(general_utilities_service ${SRC})
+ADD_EXECUTABLE(ryzom_general_utilities_service ${SRC})
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR}  ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(general_utilities_service	admin_modules 
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(ryzom_general_utilities_service
+						ryzom_adminmodules
 						ryzom_gameshare 
-						server_share
-						ai_share
+						ryzom_servershare
+						ryzom_aishare
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						${ZLIB_LIBRARIES} 
-						${NELMISC_LIBRARY} 
-						${NELNET_LIBRARY} 
-						${NELGEORGES_LIBRARY} 
-						${NELLIGO_LIBRARY})
-IF(WIN32)
-  SET_TARGET_PROPERTIES(general_utilities_service PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: General Utilities Service (GUS)")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+						nelmisc
+						nelnet 
+						nelgeorges} 
+						nelligo)
 
-INSTALL(TARGETS general_utilities_service RUNTIME DESTINATION sbin COMPONENT services)
+NL_DEFAULT_PROPS(ryzom_general_utilities_service "Ryzom, Services: General Utilities Service (GUS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_general_utilities_service)
 
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+INSTALL(TARGETS ryzom_general_utilities_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/gpm_service/CMakeLists.txt b/code/ryzom/server/src/gpm_service/CMakeLists.txt
index d644eee85..42f83a12d 100644
--- a/code/ryzom/server/src/gpm_service/CMakeLists.txt
+++ b/code/ryzom/server/src/gpm_service/CMakeLists.txt
@@ -1,23 +1,24 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(gpm_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_gpm_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(gpm_service	admin_modules 
-					ryzom_gameshare 
-					server_share
-					${PLATFORM_LINKFLAGS} 
-					${LIBXML2_LIBRARIES} 
+
+TARGET_LINK_LIBRARIES(ryzom_gpm_service
+					ryzom_adminmodules
+					ryzom_gameshare
+					ryzom_servershare
+					${PLATFORM_LINKFLAGS}
+					${LIBXML2_LIBRARIES}
 					nelmisc 
 					nelnet
 					nelpacs
 					nelgeorges
 					nelligo)
 
-NL_DEFAULT_PROPS(gpm_service "Ryzom, Services: Global Position Manager Service (GPMS)")
-NL_ADD_RUNTIME_FLAGS(gpm_service)
+NL_DEFAULT_PROPS(ryzom_gpm_service "Ryzom, Services: Global Position Manager Service (GPMS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_gpm_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS gpm_service RUNTIME DESTINATION sbin COMPONENT services)
-
+INSTALL(TARGETS ryzom_gpm_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/input_output_service/CMakeLists.txt b/code/ryzom/server/src/input_output_service/CMakeLists.txt
index 9f5afdd26..5152b25e9 100644
--- a/code/ryzom/server/src/input_output_service/CMakeLists.txt
+++ b/code/ryzom/server/src/input_output_service/CMakeLists.txt
@@ -1,6 +1,7 @@
 FILE(GLOB SRC *.cpp *.h)
 
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/bot_chat_manager.cpp
+LIST(REMOVE_ITEM SRC
+			${CMAKE_CURRENT_SOURCE_DIR}/bot_chat_manager.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/bot_chat_manager.h
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_chat_log.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_chat_log.h
@@ -9,30 +10,31 @@ LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/bot_chat_manager.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_pd.h
 			${CMAKE_CURRENT_SOURCE_DIR}/ios_pd_inline.h)
 
-ADD_EXECUTABLE(ios_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_ios_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ios_service	admin_modules 
-					pd_lib
-					ryzom_gameshare 
-					server_share
-					${PLATFORM_LINKFLAGS} 
-					${LIBXML2_LIBRARIES} 
-					nelmisc 
+TARGET_LINK_LIBRARIES(ryzom_ios_service
+					ryzom_adminmodules
+					ryzom_pd
+					ryzom_gameshare
+					ryzom_servershare
+					${PLATFORM_LINKFLAGS}
+					${LIBXML2_LIBRARIES}
+					nelmisc
 					nelnet
 					nelpacs
 					nelgeorges
 					nelligo)
 
-NL_DEFAULT_PROPS(ios_service "Ryzom, Services: Input Ouput Service (IOS)")
-NL_ADD_RUNTIME_FLAGS(ios_service)
+NL_DEFAULT_PROPS(ryzom_ios_service "Ryzom, Services: Input Ouput Service (IOS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_ios_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(ios_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_ios_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS ios_service RUNTIME DESTINATION sbin COMPONENT services)
+INSTALL(TARGETS ryzom_ios_service RUNTIME DESTINATION sbin COMPONENT services)
 
 
diff --git a/code/ryzom/server/src/log_analyser_service/CMakeLists.txt b/code/ryzom/server/src/log_analyser_service/CMakeLists.txt
index 4b77c3c90..013cef34d 100644
--- a/code/ryzom/server/src/log_analyser_service/CMakeLists.txt
+++ b/code/ryzom/server/src/log_analyser_service/CMakeLists.txt
@@ -1,22 +1,22 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(log_analyser_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_log_analyser_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(log_analyser_service	admin_modules
+
+TARGET_LINK_LIBRARIES(ryzom_log_analyser_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						pd_lib
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
-						nelmisc 
+						ryzom_pd
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
 						nelnet
 						nelgeorges)
 
-NL_DEFAULT_PROPS(log_analyser_service "Ryzom, Services: Log Analyzer Service (LAS)")
-NL_ADD_RUNTIME_FLAGS(log_analyser_service)
+NL_DEFAULT_PROPS(ryzom_log_analyser_service "Ryzom, Services: Log Analyzer Service (LAS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_log_analyser_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS log_analyser_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_log_analyser_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/logger_service/CMakeLists.txt b/code/ryzom/server/src/logger_service/CMakeLists.txt
index 540481120..99896618a 100644
--- a/code/ryzom/server/src/logger_service/CMakeLists.txt
+++ b/code/ryzom/server/src/logger_service/CMakeLists.txt
@@ -1,21 +1,21 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(logger_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_logger_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(logger_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_logger_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						server_share
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
+						ryzom_servershare
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
 						nelmisc 
 						nelnet)
 
-NL_DEFAULT_PROPS(logger_service "Ryzom, Services: Logger Service (LGS)")
-NL_ADD_RUNTIME_FLAGS(logger_service)
+NL_DEFAULT_PROPS(ryzom_logger_service "Ryzom, Services: Logger Service (LGS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_logger_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS logger_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_logger_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/mail_forum_service/CMakeLists.txt b/code/ryzom/server/src/mail_forum_service/CMakeLists.txt
index f03364b56..9177408f5 100644
--- a/code/ryzom/server/src/mail_forum_service/CMakeLists.txt
+++ b/code/ryzom/server/src/mail_forum_service/CMakeLists.txt
@@ -1,25 +1,25 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(mail_forum_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_mail_forum_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(mail_forum_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_mail_forum_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						server_share
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
+						ryzom_servershare
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
 						nelmisc 
 						nelnet)
 
-NL_DEFAULT_PROPS(mail_forum_service "Ryzom, Services: Mail Forum Service (MFS)")
-NL_ADD_RUNTIME_FLAGS(mail_forum_service)
+NL_DEFAULT_PROPS(ryzom_mail_forum_service "Ryzom, Services: Mail Forum Service (MFS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_mail_forum_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(mail_forum_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_mail_forum_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS mail_forum_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_mail_forum_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/mirror_service/CMakeLists.txt b/code/ryzom/server/src/mirror_service/CMakeLists.txt
index 073d673ff..4366534a1 100644
--- a/code/ryzom/server/src/mirror_service/CMakeLists.txt
+++ b/code/ryzom/server/src/mirror_service/CMakeLists.txt
@@ -1,9 +1,11 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(mirror_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_mirror_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(mirror_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_mirror_service
+					ryzom_adminmodules
 					ryzom_gameshare
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
@@ -11,11 +13,9 @@ TARGET_LINK_LIBRARIES(mirror_service	admin_modules
 					nelnet
 					nelgeorges)
 
-NL_DEFAULT_PROPS(mirror_service "Ryzom, Services: Mirror Service (MS)")
-NL_ADD_RUNTIME_FLAGS(mirror_service)
+NL_DEFAULT_PROPS(ryzom_mirror_service "Ryzom, Services: Mirror Service (MS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_mirror_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS mirror_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_mirror_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/patchman_service/CMakeLists.txt b/code/ryzom/server/src/patchman_service/CMakeLists.txt
index c7913f53d..653776cca 100644
--- a/code/ryzom/server/src/patchman_service/CMakeLists.txt
+++ b/code/ryzom/server/src/patchman_service/CMakeLists.txt
@@ -1,30 +1,30 @@
 FILE(GLOB SRC *.cpp *.h)
 
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
+LIST(REMOVE_ITEM SRC
+			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h)
 
-ADD_EXECUTABLE(patchman_service ${SRC})
+ADD_EXECUTABLE(ryzom_patchman_service ${SRC})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(patchman_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_patchman_service
+					ryzom_adminmodules
 					ryzom_gameshare 
-					server_share
+					ryzom_servershare
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
 					${MYSQL_LIBRARIES} 
 					${ZLIB_LIBRARIES}
-					${NELMISC_LIBRARY} 
-					${NELNET_LIBRARY} 
-					${NELPACS_LIBRARY}
-					${NELGEORGES_LIBRARY} 
-					${NELLIGO_LIBRARY})
-IF(WIN32)
-  SET_TARGET_PROPERTIES(patchman_service PROPERTIES 
-	LINK_FLAGS "/NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS"
-	PROJECT_LABEL "Services: Patch Manager (PMS)")
-ENDIF(WIN32)
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+					nelmisc
+					nelnet
+					nelpacs
+					nelgeorges
+					nelligo)
 
-INSTALL(TARGETS patchman_service RUNTIME DESTINATION sbin COMPONENT services)
+NL_DEFAULT_PROPS(ryzom_patchman_service "Ryzom, Services: Patch Manager Service (PMS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_patchman_service)
 
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
+INSTALL(TARGETS ryzom_patchman_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/pd_lib/CMakeLists.txt b/code/ryzom/server/src/pd_lib/CMakeLists.txt
index 8afe31c4c..44fd2791f 100644
--- a/code/ryzom/server/src/pd_lib/CMakeLists.txt
+++ b/code/ryzom/server/src/pd_lib/CMakeLists.txt
@@ -1,17 +1,19 @@
 FILE(GLOB SRC *.cpp *.h)
 
 # Filter out the source files not actually compiled.
-LIST(REMOVE_ITEM SRC	${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.cpp
+LIST(REMOVE_ITEM SRC
+			${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/pd_string_manager.h)
 
-NL_TARGET_LIB(pd_lib ${SRC})
+NL_TARGET_LIB(ryzom_pd ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(pd_lib nelmisc)
-  
-NL_DEFAULT_PROPS(pd_lib "Ryzom, Library: PD Lib")
-NL_ADD_LIB_SUFFIX(pd_lib)
+
+TARGET_LINK_LIBRARIES(ryzom_pd nelmisc nelnet)
+NL_DEFAULT_PROPS(ryzom_pd "Ryzom, Library: PD Lib")
+NL_ADD_RUNTIME_FLAGS(ryzom_pd)
+NL_ADD_LIB_SUFFIX(ryzom_pd)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS pd_lib LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+INSTALL(TARGETS ryzom_pd LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
index 5e300c77b..ec04a890d 100644
--- a/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
+++ b/code/ryzom/server/src/pd_reference_builder/CMakeLists.txt
@@ -1,24 +1,21 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(reference_builder_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_reference_builder_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(reference_builder_service	
+TARGET_LINK_LIBRARIES(ryzom_reference_builder_service
 						ryzom_gameshare
-						pd_lib
-						nelmisc 
+						ryzom_pd
+						nelmisc
 						nelnet
 						nelgeorges
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
-						)
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES})
 						
 						
-NL_DEFAULT_PROPS(reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)")
-NL_ADD_RUNTIME_FLAGS(reference_builder_service)
+NL_DEFAULT_PROPS(ryzom_reference_builder_service "Ryzom, Services: Reference Builder Service (RBS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_reference_builder_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS reference_builder_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_reference_builder_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/pd_support_service/CMakeLists.txt b/code/ryzom/server/src/pd_support_service/CMakeLists.txt
index ec43450f4..0d7d482e3 100644
--- a/code/ryzom/server/src/pd_support_service/CMakeLists.txt
+++ b/code/ryzom/server/src/pd_support_service/CMakeLists.txt
@@ -1,21 +1,20 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(pd_support_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_pd_support_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(pd_support_service	admin_modules 
+TARGET_LINK_LIBRARIES(ryzom_pd_support_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						server_share
+						ryzom_servershare
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						nelmisc 
 						nelnet)
 
-NL_DEFAULT_PROPS(pd_support_service "Ryzom, Services: PD Support Service (PDSS)")
-NL_ADD_RUNTIME_FLAGS(pd_support_service)
+NL_DEFAULT_PROPS(ryzom_pd_support_service "Ryzom, Services: PD Support Service (PDSS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_pd_support_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS pd_support_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_pd_support_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/persistant_data_service/CMakeLists.txt b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt
index 3d22cac75..62939f72d 100644
--- a/code/ryzom/server/src/persistant_data_service/CMakeLists.txt
+++ b/code/ryzom/server/src/persistant_data_service/CMakeLists.txt
@@ -1,21 +1,21 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(persistant_data_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_persistant_data_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(persistant_data_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_persistant_data_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						pd_lib
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
-						nelmisc 
+						ryzom_pd
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
 						nelnet)
 
-NL_DEFAULT_PROPS(persistant_data_service "Ryzom, Services: Persistent Data Service (PDS)")
-NL_ADD_RUNTIME_FLAGS(persistant_data_service)
+NL_DEFAULT_PROPS(ryzom_persistant_data_service "Ryzom, Services: Persistent Data Service (PDS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_persistant_data_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS persistant_data_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_persistant_data_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
index d2fc013e2..ee3343de8 100644
--- a/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ryzom_admin_service/CMakeLists.txt
@@ -3,7 +3,9 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(ryzom_admin_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ryzom_admin_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_admin_service
+						ryzom_adminmodules
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						nelmisc 
diff --git a/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
index 729b7ee94..586d27135 100644
--- a/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ryzom_naming_service/CMakeLists.txt
@@ -3,7 +3,9 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(ryzom_naming_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ryzom_naming_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_naming_service
+						ryzom_adminmodules
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						nelmisc 
diff --git a/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt b/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
index d283c9c13..2be062525 100644
--- a/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
+++ b/code/ryzom/server/src/ryzom_welcome_service/CMakeLists.txt
@@ -3,7 +3,9 @@ FILE(GLOB SRC *.cpp *.h)
 ADD_EXECUTABLE(ryzom_welcome_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ryzom_welcome_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_welcome_service
+						ryzom_adminmodules
 						ryzom_gameshare
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
diff --git a/code/ryzom/server/src/server_share/CMakeLists.txt b/code/ryzom/server/src/server_share/CMakeLists.txt
index 6779f327a..0a8cb6045 100644
--- a/code/ryzom/server/src/server_share/CMakeLists.txt
+++ b/code/ryzom/server/src/server_share/CMakeLists.txt
@@ -1,17 +1,26 @@
 FILE(GLOB SRC *.cpp *.h)
 
-NL_TARGET_LIB(server_share ${SRC})
+NL_TARGET_LIB(ryzom_servershare ${SRC})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(server_share nelmisc nelpacs ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES})
 
-NL_DEFAULT_PROPS(server_share "Ryzom, Library: Service Shared")
-NL_ADD_LIB_SUFFIX(server_share)
+TARGET_LINK_LIBRARIES(ryzom_servershare
+						nelmisc
+						nelpacs
+						nelgeorges
+						nelnet
+						ryzom_gameshare
+						${MYSQL_LIBRARIES}
+						${ZLIB_LIBRARIES})
+
+NL_DEFAULT_PROPS(ryzom_servershare "Ryzom, Library: Service Shared")
+NL_ADD_RUNTIME_FLAGS(ryzom_servershare)
+NL_ADD_LIB_SUFFIX(ryzom_servershare)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(server_share ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_servershare ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS server_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+INSTALL(TARGETS ryzom_servershare LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
diff --git a/code/ryzom/server/src/session_browser_server/CMakeLists.txt b/code/ryzom/server/src/session_browser_server/CMakeLists.txt
index 769621e73..bb5ac2cc9 100644
--- a/code/ryzom/server/src/session_browser_server/CMakeLists.txt
+++ b/code/ryzom/server/src/session_browser_server/CMakeLists.txt
@@ -1,11 +1,13 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(session_browser_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_session_browser_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(session_browser_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_session_browser_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						server_share
+						ryzom_servershare
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						${MYSQL_LIBRARIES}
@@ -14,11 +16,9 @@ TARGET_LINK_LIBRARIES(session_browser_service	admin_modules
 						nelnet
 						nelgeorges)
 
-NL_DEFAULT_PROPS(session_browser_service "Ryzom, Services: Session Browser Service (SBS)")
-NL_ADD_RUNTIME_FLAGS(session_browser_service)
+NL_DEFAULT_PROPS(ryzom_session_browser_service "Ryzom, Services: Session Browser Service (SBS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_session_browser_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS session_browser_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_session_browser_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt b/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt
index df2db07d8..f09e292ec 100644
--- a/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt
+++ b/code/ryzom/server/src/shard_unifier_service/CMakeLists.txt
@@ -1,11 +1,13 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(shard_unifier_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_shard_unifier_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(shard_unifier_service	admin_modules 
+
+TARGET_LINK_LIBRARIES(ryzom_shard_unifier_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						server_share
+						ryzom_servershare
 						${PLATFORM_LINKFLAGS} 
 						${LIBXML2_LIBRARIES} 
 						${MYSQL_LIBRARIES}
@@ -14,15 +16,13 @@ TARGET_LINK_LIBRARIES(shard_unifier_service	admin_modules
 						nelnet
 						nelgeorges)
 
-NL_DEFAULT_PROPS(shard_unifier_service "Ryzom, Services: Shard Unifier Service (SUS)")
-NL_ADD_RUNTIME_FLAGS(shard_unifier_service)
+NL_DEFAULT_PROPS(ryzom_shard_unifier_service "Ryzom, Services: Shard Unifier Service (SUS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_shard_unifier_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)
-  ADD_NATIVE_PRECOMPILED_HEADER(shard_unifier_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
+  ADD_NATIVE_PRECOMPILED_HEADER(ryzom_shard_unifier_service ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp)
 ENDIF(WITH_PCH)
 
-INSTALL(TARGETS shard_unifier_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_shard_unifier_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/server/src/tick_service/CMakeLists.txt b/code/ryzom/server/src/tick_service/CMakeLists.txt
index cb74e1ad9..7851aa21b 100644
--- a/code/ryzom/server/src/tick_service/CMakeLists.txt
+++ b/code/ryzom/server/src/tick_service/CMakeLists.txt
@@ -1,21 +1,20 @@
 FILE(GLOB SRC *.cpp *.h)
 
-ADD_EXECUTABLE(tick_service WIN32 ${SRC})
+ADD_EXECUTABLE(ryzom_tick_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(tick_service	admin_modules 
+TARGET_LINK_LIBRARIES(ryzom_tick_service
+						ryzom_adminmodules
 						ryzom_gameshare
-						${PLATFORM_LINKFLAGS} 
-						${LIBXML2_LIBRARIES} 
-						nelmisc 
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
 						nelnet
 						nelgeorges)
 
-NL_DEFAULT_PROPS(tick_service "Ryzom, Services: Tick Service (TS)")
-NL_ADD_RUNTIME_FLAGS(tick_service)
+NL_DEFAULT_PROPS(ryzom_tick_service "Ryzom, Services: Tick Service (TS)")
+NL_ADD_RUNTIME_FLAGS(ryzom_tick_service)
 
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
-INSTALL(TARGETS tick_service RUNTIME DESTINATION sbin COMPONENT services)
-
-
+INSTALL(TARGETS ryzom_tick_service RUNTIME DESTINATION sbin COMPONENT services)
diff --git a/code/ryzom/tools/leveldesign/export/CMakeLists.txt b/code/ryzom/tools/leveldesign/export/CMakeLists.txt
index 56ad84bf1..4fdbabbce 100644
--- a/code/ryzom/tools/leveldesign/export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/export/CMakeLists.txt
@@ -2,8 +2,16 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(export ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-TARGET_LINK_LIBRARIES(export ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(export
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc)
+
+NL_DEFAULT_PROPS(export "Ryzom, Tools: Export")
+NL_ADD_RUNTIME_FLAGS(export)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS export RUNTIME DESTINATION bin COMPONENT tools)
diff --git a/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt b/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
index 61d4a37ac..62ae49a35 100644
--- a/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/named_items_2_csv/CMakeLists.txt
@@ -2,8 +2,16 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(named2csv ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(named2csv ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(named2csv
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc)
+
+NL_DEFAULT_PROPS(named2csv "Ryzom, Tools: Named Items to CSV")
+NL_ADD_RUNTIME_FLAGS(named2csv)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS named2csv RUNTIME DESTINATION bin COMPONENT tools)
diff --git a/code/ryzom/tools/occ2huff/CMakeLists.txt b/code/ryzom/tools/occ2huff/CMakeLists.txt
index 163db5066..23da2d76b 100644
--- a/code/ryzom/tools/occ2huff/CMakeLists.txt
+++ b/code/ryzom/tools/occ2huff/CMakeLists.txt
@@ -2,8 +2,16 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(occ2huff ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(occ2huff ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(occ2huff
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc)
+
+NL_DEFAULT_PROPS(occ2huff "Ryzom, Tools: occ2huff")
+NL_ADD_RUNTIME_FLAGS(occ2huff)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS occ2huff RUNTIME DESTINATION bin COMPONENT tools)
diff --git a/code/ryzom/tools/phrase_generator/CMakeLists.txt b/code/ryzom/tools/phrase_generator/CMakeLists.txt
index 62dd1dad1..e3aa29c4c 100644
--- a/code/ryzom/tools/phrase_generator/CMakeLists.txt
+++ b/code/ryzom/tools/phrase_generator/CMakeLists.txt
@@ -2,8 +2,17 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(phrase_generator ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(phrase_generator ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(phrase_generator
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
+						nelgeorges)
+
+NL_DEFAULT_PROPS(phrase_generator "Ryzom, Tools: Phrase Generator")
+NL_ADD_RUNTIME_FLAGS(phrase_generator)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS phrase_generator RUNTIME DESTINATION bin COMPONENT tools)
diff --git a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
index 297d2c805..c964ee728 100644
--- a/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
+++ b/code/ryzom/tools/server/ai_build_wmap/CMakeLists.txt
@@ -2,16 +2,19 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(ai_build_wmap ${SRC})
 
-INCLUDE_DIRECTORIES(	${CMAKE_SOURCE_DIR}/server/src 
-			${CMAKE_SOURCE_DIR}/common/src
-			${LIBXML2_INCLUDE_DIR} 
-			${NEL_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(ai_build_wmap	ryzom_gameshare
-					server_share 
-					ai_share 
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(ai_build_wmap
+					ryzom_gameshare
+					ryzom_servershare
+					ryzom_aishare
 					${PLATFORM_LINKFLAGS} 
 					${LIBXML2_LIBRARIES} 
-					${NELMISC_LIBRARY})
+					nelmisc)
+
+NL_DEFAULT_PROPS(ai_build_wmap "Ryzom, Services: Entity View Service (EVS)")
+NL_ADD_RUNTIME_FLAGS(ai_build_wmap)
+					
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 INSTALL(TARGETS ai_build_wmap RUNTIME DESTINATION bin COMPONENT tools)
diff --git a/code/ryzom/tools/sheet_random_generator/CMakeLists.txt b/code/ryzom/tools/sheet_random_generator/CMakeLists.txt
index 836b9223c..d9305a31f 100644
--- a/code/ryzom/tools/sheet_random_generator/CMakeLists.txt
+++ b/code/ryzom/tools/sheet_random_generator/CMakeLists.txt
@@ -2,8 +2,17 @@ FILE(GLOB SRC *.cpp *.h)
 
 ADD_EXECUTABLE(sheet_random_generator ${SRC})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS} ${NELGEORGES_INCLUDE_DIRS})
-TARGET_LINK_LIBRARIES(sheet_random_generator ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} ${NELGEORGES_LIBRARY})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(sheet_random_generator
+						${PLATFORM_LINKFLAGS}
+						${LIBXML2_LIBRARIES}
+						nelmisc
+						nelgeorges)
+
+NL_DEFAULT_PROPS(sheet_random_generator "Ryzom, Tools: Sheets Random Generator")
+NL_ADD_RUNTIME_FLAGS(sheet_random_generator)
+
 ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
 
 IF(WITH_PCH)