diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dc9f036fa..f252409ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,5 +4,5 @@ add_subdirectory(declarativeimports)
 add_subdirectory(plasmapkg)
 add_subdirectory(platformstatus)
 add_subdirectory(scriptengines)
-add_subdirectory(plasmaview)
+add_subdirectory(plasmaquick)
 add_subdirectory(shell)
diff --git a/src/plasmaview/CMakeLists.txt b/src/plasmaquick/CMakeLists.txt
similarity index 53%
rename from src/plasmaview/CMakeLists.txt
rename to src/plasmaquick/CMakeLists.txt
index b500b922b..8293642d3 100644
--- a/src/plasmaview/CMakeLists.txt
+++ b/src/plasmaquick/CMakeLists.txt
@@ -1,6 +1,6 @@
-project(PlasmaView)
+project(PlasmaQuick)
 
-set(plasmaview_LIB_SRC
+set(plasmaquick_LIB_SRC
     view.cpp
     configview.cpp
     containmentconfigview_p.cpp
@@ -12,9 +12,9 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
                     )
 
-add_library(PlasmaView SHARED ${plasmaview_LIB_SRC})
+add_library(plasmaquick SHARED ${plasmaquick_LIB_SRC})
 
-target_link_libraries(PlasmaView
+target_link_libraries(plasmaquick
     ${Qt5Quick_LIBRARIES}
     ${Qt5Qml_LIBRARIES}
     ${KWindowSystem_LIBRARIES}
@@ -26,41 +26,41 @@ target_link_libraries(PlasmaView
     kdeclarative
 )
 
-set_target_properties(PlasmaView PROPERTIES
+set_target_properties(plasmaquick PROPERTIES
                              VERSION 5.0.0
                              SOVERSION 5
                       )
 
-install(TARGETS PlasmaView EXPORT PlasmaViewTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS plasmaquick EXPORT PlasmaQuickTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
-generate_export_header(PlasmaView)
+generate_export_header(plasmaquick)
 
-set(plasmaview_LIB_INCLUDES
-    ${CMAKE_CURRENT_BINARY_DIR}/plasmaview_export.h
+set(plasmaquick_LIB_INCLUDES
+    ${CMAKE_CURRENT_BINARY_DIR}/plasmaquick_export.h
     view.h
     configview.h
 )
 
-install(FILES ${plasmaview_LIB_INCLUDES}
-        DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaview COMPONENT Devel)
+install(FILES ${plasmaquick_LIB_INCLUDES}
+        DESTINATION ${INCLUDE_INSTALL_DIR}/plasmaquick COMPONENT Devel)
 
 install(DIRECTORY
-        includes/PlasmaView
+        includes/PlasmaQuick
         DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/ COMPONENT Devel)
 
-set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/PlasmaView")
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/PlasmaQuick")
 
 configure_package_config_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaViewConfig.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/PlasmaViewConfig.cmake"
+    "${CMAKE_CURRENT_SOURCE_DIR}/PlasmaQuickConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/PlasmaQuickConfig.cmake"
     INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
     PATH_VARS  INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX
 )
 
 install(FILES
-    "${CMAKE_CURRENT_BINARY_DIR}/PlasmaViewConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/PlasmaQuickConfig.cmake"
     DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel
 )
 
-install(EXPORT PlasmaViewTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE PlasmaViewTargets.cmake NAMESPACE KF5:: )
+install(EXPORT PlasmaQuickTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE PlasmaQuickTargets.cmake NAMESPACE KF5:: )
 
diff --git a/src/plasmaquick/PlasmaQuickConfig.cmake.in b/src/plasmaquick/PlasmaQuickConfig.cmake.in
new file mode 100644
index 000000000..5b258a22f
--- /dev/null
+++ b/src/plasmaquick/PlasmaQuickConfig.cmake.in
@@ -0,0 +1,11 @@
+@PACKAGE_INIT@
+
+# Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
+
+include("${CMAKE_CURRENT_LIST_DIR}/PlasmaQuickTargets.cmake")
+
+set(PlasmaQuick_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
+set_and_check(PlasmaQuick_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@")
+
+set(PlasmaQuick_LIBRARIES KF5::PlasmaQuick)
+
diff --git a/src/plasmaview/configview.cpp b/src/plasmaquick/configview.cpp
similarity index 100%
rename from src/plasmaview/configview.cpp
rename to src/plasmaquick/configview.cpp
diff --git a/src/plasmaview/configview.h b/src/plasmaquick/configview.h
similarity index 100%
rename from src/plasmaview/configview.h
rename to src/plasmaquick/configview.h
diff --git a/src/plasmaview/configview_p.h b/src/plasmaquick/configview_p.h
similarity index 100%
rename from src/plasmaview/configview_p.h
rename to src/plasmaquick/configview_p.h
diff --git a/src/plasmaview/containmentconfigview_p.cpp b/src/plasmaquick/containmentconfigview_p.cpp
similarity index 100%
rename from src/plasmaview/containmentconfigview_p.cpp
rename to src/plasmaquick/containmentconfigview_p.cpp
diff --git a/src/plasmaview/containmentconfigview_p.h b/src/plasmaquick/containmentconfigview_p.h
similarity index 100%
rename from src/plasmaview/containmentconfigview_p.h
rename to src/plasmaquick/containmentconfigview_p.h
diff --git a/src/plasmaview/currentcontainmentactionsmodel_p.cpp b/src/plasmaquick/currentcontainmentactionsmodel_p.cpp
similarity index 100%
rename from src/plasmaview/currentcontainmentactionsmodel_p.cpp
rename to src/plasmaquick/currentcontainmentactionsmodel_p.cpp
diff --git a/src/plasmaview/currentcontainmentactionsmodel_p.h b/src/plasmaquick/currentcontainmentactionsmodel_p.h
similarity index 100%
rename from src/plasmaview/currentcontainmentactionsmodel_p.h
rename to src/plasmaquick/currentcontainmentactionsmodel_p.h
diff --git a/src/plasmaview/includes/PlasmaView/ConfigView b/src/plasmaquick/includes/PlasmaQuick/ConfigView
similarity index 100%
rename from src/plasmaview/includes/PlasmaView/ConfigView
rename to src/plasmaquick/includes/PlasmaQuick/ConfigView
diff --git a/src/plasmaview/includes/PlasmaView/View b/src/plasmaquick/includes/PlasmaQuick/View
similarity index 100%
rename from src/plasmaview/includes/PlasmaView/View
rename to src/plasmaquick/includes/PlasmaQuick/View
diff --git a/src/plasmaview/view.cpp b/src/plasmaquick/view.cpp
similarity index 100%
rename from src/plasmaview/view.cpp
rename to src/plasmaquick/view.cpp
diff --git a/src/plasmaview/view.h b/src/plasmaquick/view.h
similarity index 100%
rename from src/plasmaview/view.h
rename to src/plasmaquick/view.h
diff --git a/src/plasmaview/PlasmaViewConfig.cmake.in b/src/plasmaview/PlasmaViewConfig.cmake.in
deleted file mode 100644
index 74db60755..000000000
--- a/src/plasmaview/PlasmaViewConfig.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-@PACKAGE_INIT@
-
-# Any changes in this ".cmake" file will be overwritten by CMake, the source is the ".cmake.in" file.
-
-include("${CMAKE_CURRENT_LIST_DIR}/PlasmaViewTargets.cmake")
-
-set(PlasmaView_INSTALL_PREFIX "@PACKAGE_CMAKE_INSTALL_PREFIX@")
-set_and_check(PlasmaView_INCLUDE_DIR    "@PACKAGE_INCLUDE_INSTALL_DIR@")
-
-set(PlasmaView_LIBRARIES KF5::PlasmaView)
-
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 0d6bf7c0e..60982a68b 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -78,7 +78,7 @@ target_link_libraries(plasma-shell
  ${KWindowSystem_LIBRARIES}
  ${KCoreAddons_LIBRARIES}
  plasma
- PlasmaView
+ plasmaquick
  ${Qt5Script_LIBRARIES}
  ${KDE4Support_LIBRARIES}
  ${Solid_LIBRARIES}