diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fdfa2d7db4b06b68091b3877a52ca3fdda23502..b0da1a80eb594eb158b4901a1ceb7f0c026fabc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ if(COMMAND cmake_policy)
 endif(COMMAND cmake_policy)
 
 # The project name and the type of project
-PROJECT(gnss-utils)
+PROJECT(gnss_utils)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
diff --git a/Findgnss_utils.cmake b/Findgnss_utils.cmake
index f10ba2bc922d1ff0afcf076774be4c3bf3ca7cba..ecb91c63ff9a8b4de49a0c37d33c685fab724094 100644
--- a/Findgnss_utils.cmake
+++ b/Findgnss_utils.cmake
@@ -1,6 +1,7 @@
 FIND_PATH(
     gnss_utils_INCLUDE_DIRS
-    PATHS /usr/local/include/gnss_utils)
+    NAMES gnss_utils.h
+    PATHS /usr/local/include/iri-algorithms/gnss_utils)
 IF(gnss_utils_INCLUDE_DIRS)
   MESSAGE("Found gnss_utils include dirs: ${gnss_utils_INCLUDE_DIRS}")
 ELSE(gnss_utils_INCLUDE_DIRS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20326ea0b4e378b2ed52d42be25c3e50b551a176..de5d77d2e4c021a1562ced7d450337a4ff22a814 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,11 +50,11 @@ ADD_LIBRARY(gnss_utils SHARED ${SOURCES} ${RTKLIB_SRC})
 TARGET_LINK_LIBRARIES(gnss_utils ${Boost_LIBRARIES})
 
 # Installing
-INSTALL(TARGETS gnss_utils
-        RUNTIME DESTINATION bin
-        LIBRARY DESTINATION /usr/local/lib
-        ARCHIVE DESTINATION lib)
-INSTALL(FILES ${HEADERS} DESTINATION include/gnss_utils)
-# INSTALL(FILES ../gnss_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
-INSTALL(FILES ../Findgnss_utils.cmake DESTINATION lib/cmake/${PROJECT_NAME})
+INSTALL(TARGETS ${PROJECT_NAME}
+      RUNTIME DESTINATION bin
+      LIBRARY DESTINATION lib/iri-algorithms
+      ARCHIVE DESTINATION lib/iri-algorithms)
+INSTALL(FILES ${HEADERS} DESTINATION include/iri-algorithms/gnss_utils)
+INSTALL(FILES ../Findgnss_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
+
 ADD_SUBDIRECTORY(examples)