diff --git a/CMakeLists.txt b/CMakeLists.txt
index a07d7cf..fea265a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,6 @@
 cmake_minimum_required(VERSION 3.1.0)
 project(wrp_sdk)
 
-# Find catkin
-find_package(catkin REQUIRED)
-
 # generate symbols for IDE indexer
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/devel)
@@ -17,6 +14,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # set(CMAKE_BUILD_TYPE Release)
 # set(CMAKE_BUILD_TYPE Debug)
 
+## Optionally built modules: ON/OFF
+set(BUILD_TESTS OFF)
+set(BUILD_MONITOR ON)
+
+#############################################################################
+
 set(default_build_type "Release")
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
@@ -37,10 +40,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 
-## Optionally built modules: ON/OFF
-set(BUILD_TESTS OFF)
-set(BUILD_MONITOR ON)
-
 # Disable monitor if ncurses library is not found
 set(CURSES_NEED_NCURSES TRUE)
 find_package(Curses QUIET)
@@ -90,23 +89,15 @@ set(INSTALL_CMAKEDIR ${DEF_INSTALL_CMAKEDIR} CACHE PATH "Installation directory
 # Report to user
 foreach(p LIB BIN INCLUDE CMAKE)
     file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${INSTALL_${p}DIR} _path)
-    message(STATUS "Installing ${p} components to ${_path}")
+    message(STATUS " -> To install ${p} components to ${_path}")
     unset(_path)
 endforeach()
 
-## Export catkin targets
-catkin_package(
- INCLUDE_DIRS include
- LIBRARIES ${PROJECT_NAME}
-#  CATKIN_DEPENDS hunter_msgs roscpp 
-#  DEPENDS system_lib
-)
-
-## Add catkin install targets
-install(TARGETS ${PROJECT_NAME}
-  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
+## Add install targets
+# install(TARGETS ${PROJECT_NAME}
+#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+#   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+#   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
 
 # install(DIRECTORY include/${PROJECT_NAME}/
 #   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ebb0106..6ea0499 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,22 +1,22 @@
 # Add executables
 add_executable(test_aserial test_aserial.cpp)
-target_link_libraries(test_aserial wrpsdk)
+target_link_libraries(test_aserial wrp_sdk)
 
 add_executable(test_aserial_comm test_aserial_comm.cpp)
-target_link_libraries(test_aserial_comm wrpsdk)
+target_link_libraries(test_aserial_comm wrp_sdk)
 
 add_executable(test_asio_can test_asio_can.cpp)
-target_link_libraries(test_asio_can wrpsdk)
+target_link_libraries(test_asio_can wrp_sdk)
 
 add_executable(test_acan test_acan.cpp)
-target_link_libraries(test_acan wrpsdk)
+target_link_libraries(test_acan wrp_sdk)
 
 # hunter
 add_executable(test_hunter_base test_hunter_base.cpp)
-target_link_libraries(test_hunter_base wrpsdk)
+target_link_libraries(test_hunter_base wrp_sdk)
 
 # scout
 add_executable(test_scout_base test_scout_base.cpp)
-target_link_libraries(test_scout_base wrpsdk)
+target_link_libraries(test_scout_base wrp_sdk)
 
 # tracer
diff --git a/unit_tests/CMakeLists.txt b/unit_tests/CMakeLists.txt
index b6cbd19..0a551e4 100644
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -8,7 +8,7 @@ set(GTEST_SRC
     gtests/scout_can_protocol_test.cpp
 )
 add_executable(scout_sdk_test ${GTEST_SRC})
-target_link_libraries(scout_sdk_test gtest gtest_main wrpsdk)
+target_link_libraries(scout_sdk_test gtest gtest_main wrp_sdk)
 target_include_directories(scout_sdk_test PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<BUILD_INTERFACE:${GTEST_INCLUDE_DIRS}>