diff --git a/gen/roah_rsbb_msgs/CMakeLists.txt b/gen/roah_rsbb_msgs/CMakeLists.txt
index ef2e685..82c2c58 100644
--- a/gen/roah_rsbb_msgs/CMakeLists.txt
+++ b/gen/roah_rsbb_msgs/CMakeLists.txt
@@ -3,8 +3,8 @@ include_directories(${PROTOBUF_INCLUDE_DIRS})
 
 file(GLOB ROAH_RSBB_MSGS_PROTOS ${CMAKE_CURRENT_SOURCE_DIR}/../../proto/*.proto)
 protobuf_generate_cpp(RSBB_PROTO_SRCS RSBB_PROTO_HDRS ${ROAH_RSBB_MSGS_PROTOS})
-add_library(roah_rsbb_msgs STATIC ${RSBB_PROTO_SRCS})
-target_link_libraries(roah_rsbb_msgs ${PROTOBUF_LIBRARIES})
+add_library(${DISAMBIGUATION}roah_rsbb_msgs STATIC ${RSBB_PROTO_SRCS})
+target_link_libraries(${DISAMBIGUATION}roah_rsbb_msgs ${PROTOBUF_LIBRARIES})
 
 set(ROAH_RSBB_MSGS_HPP "${CMAKE_CURRENT_BINARY_DIR}/../roah_rsbb_msgs.h")
 file(REMOVE ${ROAH_RSBB_MSGS_HPP})
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
index a94f3a9..22baae3 100644
--- a/libs/CMakeLists.txt
+++ b/libs/CMakeLists.txt
@@ -9,7 +9,7 @@ add_definitions("-DHAVE_LIBCRYPTO")
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 file(GLOB PROTOBUF_COMM_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/protobuf_comm/*.cpp)
-add_library(protobuf_comm STATIC ${PROTOBUF_COMM_SOURCES})
-target_link_libraries(protobuf_comm ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES})
+add_library(${DISAMBIGUATION}protobuf_comm STATIC ${PROTOBUF_COMM_SOURCES})
+target_link_libraries(${DISAMBIGUATION}protobuf_comm ${OPENSSL_LIBRARIES} ${Boost_LIBRARIES})
 
 set(INCLUDE_DIRS ${INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)