diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@
 endif()
 
 set(REQUIRED_QT_VERSION 5.9.0)
-set(KF5_MIN_VERSION 5.42.0)
+set(KF5_MIN_VERSION 5.45.0)
 
 include(FeatureSummary)
 
diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
--- a/applets/CMakeLists.txt
+++ b/applets/CMakeLists.txt
@@ -1,7 +1,7 @@
-plasma_install_package(activitypager org.kde.plasma.activitypager)
-plasma_install_package(kickerdash org.kde.plasma.kickerdash)
-plasma_install_package(konsoleprofiles/package org.kde.plasma.konsoleprofiles)
-plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
+plasma_install_bundled_package(activitypager org.kde.plasma.activitypager)
+plasma_install_bundled_package(kickerdash org.kde.plasma.kickerdash)
+plasma_install_bundled_package(konsoleprofiles/package org.kde.plasma.konsoleprofiles)
+plasma_install_bundled_package(keyboardindicator org.kde.plasma.keyboardindicator)
 
 add_subdirectory(binary-clock)
 add_subdirectory(calculator)
diff --git a/applets/binary-clock/CMakeLists.txt b/applets/binary-clock/CMakeLists.txt
--- a/applets/binary-clock/CMakeLists.txt
+++ b/applets/binary-clock/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_package(package org.kde.plasma.binaryclock)
+plasma_install_bundled_package(package org.kde.plasma.binaryclock)
diff --git a/applets/calculator/CMakeLists.txt b/applets/calculator/CMakeLists.txt
--- a/applets/calculator/CMakeLists.txt
+++ b/applets/calculator/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_package(package org.kde.plasma.calculator)
+plasma_install_bundled_package(package org.kde.plasma.calculator)
diff --git a/applets/colorpicker/CMakeLists.txt b/applets/colorpicker/CMakeLists.txt
--- a/applets/colorpicker/CMakeLists.txt
+++ b/applets/colorpicker/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
-plasma_install_package(package org.kde.plasma.colorpicker)
+plasma_install_bundled_package(package org.kde.plasma.colorpicker)
 
 set(colorpickerplugin_SRCS
     plugin/grabwidget.cpp
diff --git a/applets/comic/CMakeLists.txt b/applets/comic/CMakeLists.txt
--- a/applets/comic/CMakeLists.txt
+++ b/applets/comic/CMakeLists.txt
@@ -38,5 +38,5 @@
 #install(FILES plasma-comic-default.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 install(FILES comic.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
-plasma_install_package(package org.kde.plasma.comic)
+plasma_install_bundled_package(package org.kde.plasma.comic)
 
diff --git a/applets/dict/CMakeLists.txt b/applets/dict/CMakeLists.txt
--- a/applets/dict/CMakeLists.txt
+++ b/applets/dict/CMakeLists.txt
@@ -10,7 +10,7 @@
 
 #######################################################################################
 # Package (metadata.desktop and QML)
-plasma_install_package(package org.kde.plasma_applet_dict)
+plasma_install_bundled_package(package org.kde.plasma_applet_dict)
 
 #######################################################################################
 # Icon for the package
diff --git a/applets/diskquota/CMakeLists.txt b/applets/diskquota/CMakeLists.txt
--- a/applets/diskquota/CMakeLists.txt
+++ b/applets/diskquota/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 #######################################################################################
 # Package
-plasma_install_package(package org.kde.plasma.diskquota)
+plasma_install_bundled_package(package org.kde.plasma.diskquota)
 
 
 #######################################################################################
diff --git a/applets/fifteenPuzzle/CMakeLists.txt b/applets/fifteenPuzzle/CMakeLists.txt
--- a/applets/fifteenPuzzle/CMakeLists.txt
+++ b/applets/fifteenPuzzle/CMakeLists.txt
@@ -3,7 +3,7 @@
     DESTINATION ${KDE_INSTALL_ICONDIR}
 )
 
-plasma_install_package(package org.kde.plasma.fifteenpuzzle)
+plasma_install_bundled_package(package org.kde.plasma.fifteenpuzzle)
 
 set(fifteenpuzzleplugin_SRCS
     plugin/fifteenimageprovider.cpp
diff --git a/applets/fifteenPuzzle/package/contents/ui/main.qml b/applets/fifteenPuzzle/package/contents/ui/main.qml
--- a/applets/fifteenPuzzle/package/contents/ui/main.qml
+++ b/applets/fifteenPuzzle/package/contents/ui/main.qml
@@ -21,7 +21,7 @@
 
 import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.private.fifteenpuzzle 0.1
+import org.kde.plasma.private.fifteenpuzzle 0.1 as Private
 
 Item {
     id: root
diff --git a/applets/fifteenPuzzle/plugin/fifteenpuzzleplugin.cpp b/applets/fifteenPuzzle/plugin/fifteenpuzzleplugin.cpp
--- a/applets/fifteenPuzzle/plugin/fifteenpuzzleplugin.cpp
+++ b/applets/fifteenPuzzle/plugin/fifteenpuzzleplugin.cpp
@@ -29,7 +29,7 @@
 {
     Q_UNUSED(uri);
     Q_ASSERT(QLatin1String(uri) == QLatin1String("org.kde.plasma.private.fifteenpuzzle"));
-    qmlRegisterTypeNotAvailable(uri, 0, 1, "fifteenpuzzle", QStringLiteral("fifteenpuzzle"));
+    qmlRegisterTypeNotAvailable(uri, 0, 1, "FifteenPuzzle", QStringLiteral("fifteenpuzzle"));
 }
 
 void FifteenPuzzlePlugin::initializeEngine(QQmlEngine * engine, const char * uri)
diff --git a/applets/fuzzy-clock/CMakeLists.txt b/applets/fuzzy-clock/CMakeLists.txt
--- a/applets/fuzzy-clock/CMakeLists.txt
+++ b/applets/fuzzy-clock/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_package(package org.kde.plasma.fuzzyclock)
+plasma_install_bundled_package(package org.kde.plasma.fuzzyclock)
diff --git a/applets/grouping/CMakeLists.txt b/applets/grouping/CMakeLists.txt
--- a/applets/grouping/CMakeLists.txt
+++ b/applets/grouping/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.private.grouping\")
 
-plasma_install_package(package org.kde.plasma.private.grouping)
+plasma_install_bundled_package(package org.kde.plasma.private.grouping)
 
 ecm_qt_declare_logging_category(groupingplasmoid_SRCS HEADER debug.h
                                             IDENTIFIER GROUPING_DEBUG
diff --git a/applets/grouping/container/CMakeLists.txt b/applets/grouping/container/CMakeLists.txt
--- a/applets/grouping/container/CMakeLists.txt
+++ b/applets/grouping/container/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_package(package org.kde.plasma.grouping)
+plasma_install_bundled_package(package org.kde.plasma.grouping)
 
 set(groupedappletscontainer_SRCS
     groupedappletscontainer.cpp
diff --git a/applets/mediaframe/CMakeLists.txt b/applets/mediaframe/CMakeLists.txt
--- a/applets/mediaframe/CMakeLists.txt
+++ b/applets/mediaframe/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_package(package org.kde.plasma.mediaframe)
+plasma_install_bundled_package(package org.kde.plasma.mediaframe)
 
 set(mediaframeplugin_SRCS
     plugin/mediaframe.cpp
diff --git a/applets/minimizeall/CMakeLists.txt b/applets/minimizeall/CMakeLists.txt
--- a/applets/minimizeall/CMakeLists.txt
+++ b/applets/minimizeall/CMakeLists.txt
@@ -1,2 +1,2 @@
 
-plasma_install_package(package org.kde.plasma.minimizeall)
+plasma_install_bundled_package(package org.kde.plasma.minimizeall)
diff --git a/applets/notes/CMakeLists.txt b/applets/notes/CMakeLists.txt
--- a/applets/notes/CMakeLists.txt
+++ b/applets/notes/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 #######################################################################################
 # Package
-plasma_install_package(package org.kde.plasma.notes)
+plasma_install_bundled_package(package org.kde.plasma.notes)
 
 
 #######################################################################################
diff --git a/applets/quicklaunch/CMakeLists.txt b/applets/quicklaunch/CMakeLists.txt
--- a/applets/quicklaunch/CMakeLists.txt
+++ b/applets/quicklaunch/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_subdirectory(plugin)
 
-plasma_install_package(package org.kde.plasma.quicklaunch)
+plasma_install_bundled_package(package org.kde.plasma.quicklaunch)
diff --git a/applets/quickshare/CMakeLists.txt b/applets/quickshare/CMakeLists.txt
--- a/applets/quickshare/CMakeLists.txt
+++ b/applets/quickshare/CMakeLists.txt
@@ -1,2 +1,2 @@
-plasma_install_package(plasmoid org.kde.plasma.quickshare)
+plasma_install_bundled_package(plasmoid org.kde.plasma.quickshare)
 add_subdirectory(plugin)
diff --git a/applets/showdesktop/CMakeLists.txt b/applets/showdesktop/CMakeLists.txt
--- a/applets/showdesktop/CMakeLists.txt
+++ b/applets/showdesktop/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_package(package org.kde.plasma.showdesktop)
+plasma_install_bundled_package(package org.kde.plasma.showdesktop)
 
 add_definitions(-DTRANSLATION_DOMAIN="plasma_applet_org.kde.plasma.showdesktop")
 
diff --git a/applets/systemloadviewer/CMakeLists.txt b/applets/systemloadviewer/CMakeLists.txt
--- a/applets/systemloadviewer/CMakeLists.txt
+++ b/applets/systemloadviewer/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_package(package org.kde.plasma.systemloadviewer)
+plasma_install_bundled_package(package org.kde.plasma.systemloadviewer)
diff --git a/applets/timer/CMakeLists.txt b/applets/timer/CMakeLists.txt
--- a/applets/timer/CMakeLists.txt
+++ b/applets/timer/CMakeLists.txt
@@ -1,4 +1,4 @@
-plasma_install_package(package org.kde.plasma.timer)
+plasma_install_bundled_package(package org.kde.plasma.timer)
 
 add_definitions(-DTRANSLATION_DOMAIN="plasma_applet_org.kde.plasma.timer")
 
diff --git a/applets/userswitcher/CMakeLists.txt b/applets/userswitcher/CMakeLists.txt
--- a/applets/userswitcher/CMakeLists.txt
+++ b/applets/userswitcher/CMakeLists.txt
@@ -1 +1 @@
-plasma_install_package(package org.kde.plasma.userswitcher)
+plasma_install_bundled_package(package org.kde.plasma.userswitcher)
diff --git a/applets/weather/CMakeLists.txt b/applets/weather/CMakeLists.txt
--- a/applets/weather/CMakeLists.txt
+++ b/applets/weather/CMakeLists.txt
@@ -19,7 +19,7 @@
 
 install(FILES wind-arrows.svgz DESTINATION ${PLASMA_DATA_INSTALL_DIR}/desktoptheme/default/weather/)
 
-plasma_install_package(package org.kde.plasma.weather)
+plasma_install_bundled_package(package org.kde.plasma.weather)
 
 
 set(weather_SRCS
diff --git a/applets/webbrowser/CMakeLists.txt b/applets/webbrowser/CMakeLists.txt
--- a/applets/webbrowser/CMakeLists.txt
+++ b/applets/webbrowser/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 if (Qt5WebEngine_FOUND)
 
-plasma_install_package(package org.kde.plasma.webbrowser)
+plasma_install_bundled_package(package org.kde.plasma.webbrowser)
 
 endif()