diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee86428..ee6decc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-project(partitionmanager)
+project(kpmcore)
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 
@@ -42,7 +42,7 @@ include(ECMPackageConfigHelpers)
 
 ecm_setup_version(${VERSION} VARIABLE_PREFIX KPMCORE
                         VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpmcore_version.h"
-                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/PartitionManagerConfigVersion.cmake"
+                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPMcoreConfigVersion.cmake"
                         SOVERSION 1)
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
@@ -82,19 +82,19 @@ include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE
 add_subdirectory(src)
 
 # create a Config.cmake and a ConfigVersion.cmake file and install them
-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/PartitionManager")
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KPMcore")
 
-ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/PartitionManagerConfig.cmake.in"
-                              "${CMAKE_CURRENT_BINARY_DIR}/PartitionManagerConfig.cmake"
+ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KPMcoreConfig.cmake.in"
+                              "${CMAKE_CURRENT_BINARY_DIR}/KPMcoreConfig.cmake"
                               INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
                               )
 
-install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/PartitionManagerConfig.cmake"
-               "${CMAKE_CURRENT_BINARY_DIR}/PartitionManagerConfigVersion.cmake"
+install(FILES  "${CMAKE_CURRENT_BINARY_DIR}/KPMcoreConfig.cmake"
+               "${CMAKE_CURRENT_BINARY_DIR}/KPMcoreConfigVersion.cmake"
         DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
         COMPONENT Devel )
 
-install(EXPORT PartitionManagerTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE PartitionManagerTargets.cmake )
+install(EXPORT KPMcoreTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPMcoreTargets.cmake )
 
 ki18n_install(po)
 
diff --git a/KPMcoreConfig.cmake.in b/KPMcoreConfig.cmake.in
new file mode 100644
index 0000000..27f55c6
--- /dev/null
+++ b/KPMcoreConfig.cmake.in
@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/KPMcoreTargets.cmake")
diff --git a/PartitionManagerConfig.cmake.in b/PartitionManagerConfig.cmake.in
deleted file mode 100644
index 21f8798..0000000
--- a/PartitionManagerConfig.cmake.in
+++ /dev/null
@@ -1,3 +0,0 @@
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/PartitionManagerTargets.cmake")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f912f5f..2066eba 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,12 +23,12 @@ include(jobs/CMakeLists.txt)
 include(fs/CMakeLists.txt)
 
 set(kpmcore_SRCS
-	${BACKEND_SRC}
-	${FS_SRC}
-	${CORE_SRC}
-	${OPS_SRC}
-	${JOBS_SRC}
-	${UTIL_SRC}
+    ${BACKEND_SRC}
+    ${FS_SRC}
+    ${CORE_SRC}
+    ${OPS_SRC}
+    ${JOBS_SRC}
+    ${UTIL_SRC}
 )
 
 file(GLOB kpmcore_UIFILES config/*.ui)
@@ -39,16 +39,18 @@ kconfig_add_kcfg_files(kpmcore_SRCS config.kcfgc)
 
 add_library(kpmcore SHARED ${kpmcore_SRCS})
 target_link_libraries( kpmcore
-	${UUID_LIBRARIES} ${BLKID_LIBRARIES} ${LIBATASMART_LIBRARIES}
-	KF5::ConfigCore
-	KF5::ConfigGui
-	KF5::I18n
-	KF5::IconThemes
-	KF5::KIOCore
-	KF5::Service
+    ${UUID_LIBRARIES}
+    ${BLKID_LIBRARIES}
+    ${LIBATASMART_LIBRARIES}
+    KF5::ConfigCore
+    KF5::ConfigGui
+    KF5::I18n
+    KF5::IconThemes
+    KF5::KIOCore
+    KF5::Service
 )
 
-install(TARGETS kpmcore EXPORT PartitionManagerTargets  ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kpmcore EXPORT KPMcoreTargets  ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES ${CORE_LIB_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/kpmcore/core/ COMPONENT Devel)
 install(FILES ${BACKEND_LIB_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/kpmcore/backend/ COMPONENT Devel)
 install(FILES ${FS_LIB_HDRS} DESTINATION ${INCLUDE_INSTALL_DIR}/kpmcore/fs/ COMPONENT Devel)