diff --git a/mola_input_euroc_dataset/CMakeLists.txt b/mola_input_euroc_dataset/CMakeLists.txt
index 06761dd8..654ae082 100644
--- a/mola_input_euroc_dataset/CMakeLists.txt
+++ b/mola_input_euroc_dataset/CMakeLists.txt
@@ -31,7 +31,7 @@ mola_add_library(
 	TARGET ${PROJECT_NAME}
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PRIVATE_LINK_LIBRARIES
-		mola_kernel
+		mola::mola_kernel
 		mrpt::obs
 		mrpt::math
 	CMAKE_DEPENDENCIES
diff --git a/mola_input_kitti_dataset/CMakeLists.txt b/mola_input_kitti_dataset/CMakeLists.txt
index bfcded31..8208f734 100644
--- a/mola_input_kitti_dataset/CMakeLists.txt
+++ b/mola_input_kitti_dataset/CMakeLists.txt
@@ -31,7 +31,7 @@ mola_add_library(
 	TARGET ${PROJECT_NAME}
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PUBLIC_LINK_LIBRARIES
-		mola_kernel
+		mola::mola_kernel
 	PRIVATE_LINK_LIBRARIES
 		mrpt::maps
 		mrpt::math
diff --git a/mola_input_mulran_dataset/CMakeLists.txt b/mola_input_mulran_dataset/CMakeLists.txt
index 1208170d..4ff5d0a5 100644
--- a/mola_input_mulran_dataset/CMakeLists.txt
+++ b/mola_input_mulran_dataset/CMakeLists.txt
@@ -33,7 +33,7 @@ mola_add_library(
 	TARGET ${PROJECT_NAME}
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PUBLIC_LINK_LIBRARIES
-		mola_kernel
+		mola::mola_kernel
 	PRIVATE_LINK_LIBRARIES
 		mrpt::maps
 		mrpt::math
diff --git a/mola_input_rawlog/CMakeLists.txt b/mola_input_rawlog/CMakeLists.txt
index 4e4cc484..58727871 100644
--- a/mola_input_rawlog/CMakeLists.txt
+++ b/mola_input_rawlog/CMakeLists.txt
@@ -29,7 +29,7 @@ mola_add_library(
 	TARGET ${PROJECT_NAME}
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PRIVATE_LINK_LIBRARIES
-		mola_kernel
+		mola::mola_kernel
 		mrpt::obs
 	CMAKE_DEPENDENCIES
 		mola_kernel
diff --git a/mola_input_ros2/CMakeLists.txt b/mola_input_ros2/CMakeLists.txt
index ea03fd5f..17fcc464 100644
--- a/mola_input_ros2/CMakeLists.txt
+++ b/mola_input_ros2/CMakeLists.txt
@@ -47,7 +47,7 @@ mola_add_library(
 	TARGET ${PROJECT_NAME}
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PRIVATE_LINK_LIBRARIES
-		mola_kernel
+		mola::mola_kernel
 		mrpt::maps
 		mrpt::ros2bridge
 	CMAKE_DEPENDENCIES
diff --git a/mola_input_rosbag2/CMakeLists.txt b/mola_input_rosbag2/CMakeLists.txt
index b7fcb4cb..927c5477 100644
--- a/mola_input_rosbag2/CMakeLists.txt
+++ b/mola_input_rosbag2/CMakeLists.txt
@@ -38,7 +38,7 @@ mola_add_library(
 	TARGET ${PROJECT_NAME}
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PRIVATE_LINK_LIBRARIES
-		mola_kernel
+		mola::mola_kernel
 		mrpt::obs
 		mrpt::ros2bridge
 		tf2::tf2
diff --git a/mola_kernel/CMakeLists.txt b/mola_kernel/CMakeLists.txt
index 392c30d4..7ccf865a 100644
--- a/mola_kernel/CMakeLists.txt
+++ b/mola_kernel/CMakeLists.txt
@@ -30,7 +30,7 @@ mola_add_library(
 	PUBLIC_LINK_LIBRARIES
 		mrpt::obs
 		mrpt::gui
-		mola_yaml
+		mola::mola_yaml
 	PRIVATE_LINK_LIBRARIES
 		mrpt::gui   #TODO: remove after mapviz!
 		mrpt::maps  #TODO: remove after mapviz!
diff --git a/mola_launcher/CMakeLists.txt b/mola_launcher/CMakeLists.txt
index afe3a734..f77c38c5 100644
--- a/mola_launcher/CMakeLists.txt
+++ b/mola_launcher/CMakeLists.txt
@@ -35,7 +35,7 @@ mola_add_library(
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PUBLIC_LINK_LIBRARIES
 		mrpt::core
-		mola_kernel
+		mola::mola_kernel
 	PRIVATE_LINK_LIBRARIES
 		${CMAKE_DL_LIBS} # To be able to load DLLs/.so's
 		CXX::Filesystem  # the C++>=17 std lib
diff --git a/mola_viz/CMakeLists.txt b/mola_viz/CMakeLists.txt
index c5cca5eb..25cf5e7b 100644
--- a/mola_viz/CMakeLists.txt
+++ b/mola_viz/CMakeLists.txt
@@ -30,7 +30,7 @@ mola_add_library(
 	TARGET ${PROJECT_NAME}
 	SOURCES ${LIB_SRCS} ${LIB_PUBLIC_HDRS}
 	PUBLIC_LINK_LIBRARIES
-		mola_kernel
+		mola::mola_kernel
 		mrpt::gui
 		mrpt::opengl
 		mrpt::maps