diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3892399b43771edd5c7d5cbd7ddde5724aba1179..9a9dad6870c1cdbbd326fcceddc84cc8c346b9fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ PROJECT(gnss_utils)
 
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
-set(INCLUDE_INSTALL_DIR include/iri-algorithms)
+set(INCLUDE_INSTALL_DIR include)
 set(LIB_INSTALL_DIR lib/)
 
 IF (NOT CMAKE_BUILD_TYPE)
@@ -55,7 +55,7 @@ if(BUILD_TESTS)
 endif()
 
 # Define the directory where will be the configured config.h
-SET(GNSS_UTILS_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/gnss_utils/internal)
+SET(GNSS_UTILS_CONFIG_DIR ${PROJECT_BINARY_DIR}/conf/${PROJECT_NAME}/internal)
 
 # Create the specified output directory if it does not exist.
 IF(NOT EXISTS "${GNSS_UTILS_CONFIG_DIR}")
@@ -126,10 +126,10 @@ FIND_PACKAGE(Eigen3 3.3 REQUIRED CONFIG)
 INCLUDE_DIRECTORIES(BEFORE include ${RTKLIB_SRC_DIR})
 
 # create the shared library
-ADD_LIBRARY(gnss_utils SHARED ${SOURCES} ${RTKLIB_SRC})
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${SOURCES} ${RTKLIB_SRC})
 
 # Link this library wrt. its dependencies
-TARGET_LINK_LIBRARIES(gnss_utils Eigen3::Eigen)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} Eigen3::Eigen)
 
 # Examples
 ADD_SUBDIRECTORY(src/examples)
@@ -169,12 +169,12 @@ target_include_directories(${PROJECT_NAME} INTERFACE
   $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
 )
 
-INSTALL(DIRECTORY include/gnss_utils DESTINATION ${INCLUDE_INSTALL_DIR})
+INSTALL(DIRECTORY include/${PROJECT_NAME} DESTINATION ${INCLUDE_INSTALL_DIR})
 
-INSTALL(FILES ${RTKLIB_SRC_DIR}/rtklib.h DESTINATION ${INCLUDE_INSTALL_DIR}/gnss_utils)
+INSTALL(FILES ${RTKLIB_SRC_DIR}/rtklib.h DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME})
 
 INSTALL(FILES "${GNSS_UTILS_CONFIG_DIR}/config.h"
-  DESTINATION ${INCLUDE_INSTALL_DIR}/gnss_utils/internal)
+  DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}/internal)
 
 
 ###############
diff --git a/Findgnss_utils.cmake b/Findgnss_utils.cmake
deleted file mode 100644
index b05d20c1734eeee0fcf052bb12fced13b67f1b06..0000000000000000000000000000000000000000
--- a/Findgnss_utils.cmake
+++ /dev/null
@@ -1,37 +0,0 @@
-FIND_PATH(
-    gnss_utils_INCLUDE_DIRS
-    NAMES gnss_utils/gnss_utils.h
-    PATHS /usr/local/include/iri-algorithms)
-IF(gnss_utils_INCLUDE_DIRS)
-  MESSAGE("Found gnss_utils include dirs: ${gnss_utils_INCLUDE_DIRS}")
-ELSE(gnss_utils_INCLUDE_DIRS)
-  MESSAGE("Couldn't find gnss_utils include dirs")
-ENDIF(gnss_utils_INCLUDE_DIRS)
-
-FIND_LIBRARY(
-    gnss_utils_LIBRARIES
-    NAMES libgnss_utils.so libgnss_utils.dylib
-    PATHS /usr/local/lib/iri-algorithms)
-IF(gnss_utils_LIBRARIES)
-  MESSAGE("Found gnss_utils lib: ${gnss_utils_LIBRARIES}")
-ELSE(gnss_utils_LIBRARIES)
-  MESSAGE("Couldn't find gnss_utils lib")
-ENDIF(gnss_utils_LIBRARIES)
-
-IF (gnss_utils_INCLUDE_DIRS AND gnss_utils_LIBRARIES)
-   SET(gnss_utils_FOUND TRUE)
-   SET(gnss_utils_INCLUDE_DIR ${gnss_utils_INCLUDE_DIRS})
-   SET(gnss_utils_LIBRARY ${gnss_utils_LIBRARIES})
- ELSE(gnss_utils_INCLUDE_DIRS AND gnss_utils_LIBRARIES)
-   set(gnss_utils_FOUND FALSE)
-ENDIF (gnss_utils_INCLUDE_DIRS AND gnss_utils_LIBRARIES)
-
-IF (gnss_utils_FOUND)
-   IF (NOT gnss_utils_FIND_QUIETLY)
-      MESSAGE(STATUS "Found gnss_utils: ${gnss_utils_LIBRARIES}")
-   ENDIF (NOT gnss_utils_FIND_QUIETLY)
-ELSE (gnss_utils_FOUND)
-   IF (gnss_utils_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find gnss_utils")
-   ENDIF (gnss_utils_FIND_REQUIRED)
-ENDIF (gnss_utils_FOUND)