diff --git a/examples/applets/testcomponents/contents/ui/ButtonsPage.qml b/examples/applets/testcomponents/contents/ui/ButtonsPage.qml
index 8d36b5ae7..756423780 100644
--- a/examples/applets/testcomponents/contents/ui/ButtonsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/ButtonsPage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // ButtonsPage
 
diff --git a/examples/applets/testcomponents/contents/ui/DialogContent.qml b/examples/applets/testcomponents/contents/ui/DialogContent.qml
index 92efda9df..03f20d832 100644
--- a/examples/applets/testcomponents/contents/ui/DialogContent.qml
+++ b/examples/applets/testcomponents/contents/ui/DialogContent.qml
@@ -22,7 +22,7 @@ import QtQuick.Window 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // DialogContent
 
diff --git a/examples/applets/testcomponents/contents/ui/DialogsPage.qml b/examples/applets/testcomponents/contents/ui/DialogsPage.qml
index 27c006d4d..afb214da3 100644
--- a/examples/applets/testcomponents/contents/ui/DialogsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/DialogsPage.qml
@@ -22,7 +22,7 @@ import QtQuick.Window 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // DialogsPage
 
diff --git a/examples/applets/testcomponents/contents/ui/DragItem.qml b/examples/applets/testcomponents/contents/ui/DragItem.qml
index 23f4a2f35..d6aa2ec02 100644
--- a/examples/applets/testcomponents/contents/ui/DragItem.qml
+++ b/examples/applets/testcomponents/contents/ui/DragItem.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 import org.kde.draganddrop 2.0 as DragAndDrop
 
diff --git a/examples/applets/testcomponents/contents/ui/DragPage.qml b/examples/applets/testcomponents/contents/ui/DragPage.qml
index e3d2cdc45..b1e4ab7a7 100644
--- a/examples/applets/testcomponents/contents/ui/DragPage.qml
+++ b/examples/applets/testcomponents/contents/ui/DragPage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 import org.kde.draganddrop 2.0 as DragAndDrop
 
diff --git a/examples/applets/testcomponents/contents/ui/IconsPage.qml b/examples/applets/testcomponents/contents/ui/IconsPage.qml
index 834cdc2c3..55b6aa2a9 100644
--- a/examples/applets/testcomponents/contents/ui/IconsPage.qml
+++ b/examples/applets/testcomponents/contents/ui/IconsPage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // IconTab
 
@@ -77,7 +77,7 @@ PlasmaComponents.Page {
                 width: _h
                 height: width
             }
-            QtExtras.QIconItem {
+            KQuickControlsAddons.QIconItem {
                 icon: "preferences-desktop-icons"
                 width: _h
                 height: width
diff --git a/examples/applets/testcomponents/contents/ui/MousePage.qml b/examples/applets/testcomponents/contents/ui/MousePage.qml
index 3b7b22e72..097f4339f 100644
--- a/examples/applets/testcomponents/contents/ui/MousePage.qml
+++ b/examples/applets/testcomponents/contents/ui/MousePage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // MousePage
 
@@ -36,7 +36,7 @@ PlasmaComponents.Page {
         text: "MouseEventListener"
         anchors { left: parent.left; right: parent.right; top: parent.top }
     }
-    QtExtras.MouseEventListener {
+    KQuickControlsAddons.MouseEventListener {
         id: mel
         hoverEnabled: true
         anchors { left: parent.left; right: parent.right; top: mellabel.bottom; bottom: parent.bottom; }
diff --git a/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml b/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml
index 8beca33f2..22688ed7f 100644
--- a/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml
+++ b/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml
@@ -20,7 +20,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // PlasmoidPage
 
diff --git a/examples/applets/testcomponents/contents/ui/TestMenu.qml b/examples/applets/testcomponents/contents/ui/TestMenu.qml
index b84197b49..27f9ab48a 100644
--- a/examples/applets/testcomponents/contents/ui/TestMenu.qml
+++ b/examples/applets/testcomponents/contents/ui/TestMenu.qml
@@ -20,7 +20,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // PlasmoidPage
 
diff --git a/examples/applets/testcomponents/contents/ui/ThemePage.qml b/examples/applets/testcomponents/contents/ui/ThemePage.qml
index 08fcd533d..91511ff81 100644
--- a/examples/applets/testcomponents/contents/ui/ThemePage.qml
+++ b/examples/applets/testcomponents/contents/ui/ThemePage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // IconTab
 
diff --git a/examples/applets/testcomponents/contents/ui/testcomponents.qml b/examples/applets/testcomponents/contents/ui/testcomponents.qml
index f7333b583..025b372fd 100644
--- a/examples/applets/testcomponents/contents/ui/testcomponents.qml
+++ b/examples/applets/testcomponents/contents/ui/testcomponents.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 Item {
     id: root
diff --git a/examples/applets/testshaders/contents/ui/EditorPage.qml b/examples/applets/testshaders/contents/ui/EditorPage.qml
index 6a5603e97..52de2f36b 100644
--- a/examples/applets/testshaders/contents/ui/EditorPage.qml
+++ b/examples/applets/testshaders/contents/ui/EditorPage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // ButtonsPage
 
diff --git a/examples/applets/testshaders/contents/ui/ShaderExample.qml b/examples/applets/testshaders/contents/ui/ShaderExample.qml
index 9f25a4535..4309b14c6 100644
--- a/examples/applets/testshaders/contents/ui/ShaderExample.qml
+++ b/examples/applets/testshaders/contents/ui/ShaderExample.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // VertexPage
 
diff --git a/examples/applets/testshaders/contents/ui/WaterEffect.qml b/examples/applets/testshaders/contents/ui/WaterEffect.qml
index aca7cd4d8..e9be24055 100644
--- a/examples/applets/testshaders/contents/ui/WaterEffect.qml
+++ b/examples/applets/testshaders/contents/ui/WaterEffect.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // VertexPage
 
diff --git a/examples/applets/testshaders/contents/ui/testshaderapplet.qml b/examples/applets/testshaders/contents/ui/testshaderapplet.qml
index f517383e9..d31a400c8 100644
--- a/examples/applets/testshaders/contents/ui/testshaderapplet.qml
+++ b/examples/applets/testshaders/contents/ui/testshaderapplet.qml
@@ -21,7 +21,7 @@ import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 Item {
     id: root
diff --git a/examples/applets/testtheme/contents/ui/ScalePage.qml b/examples/applets/testtheme/contents/ui/ScalePage.qml
index c9d21d88d..4e7d1bb10 100644
--- a/examples/applets/testtheme/contents/ui/ScalePage.qml
+++ b/examples/applets/testtheme/contents/ui/ScalePage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 Item {
 
@@ -125,7 +125,7 @@ Item {
             width: units.iconSizes.huge
             height: width
         }
-//         QtExtras.QIconItem {
+//         KQuickControlsAddons.QIconItem {
 //             icon: "preferences-desktop-icons"
 //             width: units.iconSizes.enormous
 //             height: width
diff --git a/examples/applets/testtheme/contents/ui/UnitsPage.qml b/examples/applets/testtheme/contents/ui/UnitsPage.qml
index 8865bbedc..66dc2730e 100644
--- a/examples/applets/testtheme/contents/ui/UnitsPage.qml
+++ b/examples/applets/testtheme/contents/ui/UnitsPage.qml
@@ -21,7 +21,7 @@ import QtQuick 2.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 // IconTab
 
diff --git a/examples/applets/testtheme/contents/ui/testtheme.qml b/examples/applets/testtheme/contents/ui/testtheme.qml
index 60faf3fac..34d6f2684 100644
--- a/examples/applets/testtheme/contents/ui/testtheme.qml
+++ b/examples/applets/testtheme/contents/ui/testtheme.qml
@@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 // import org.kde.plasma.extras 2.0 as PlasmaExtras
-// import org.kde.qtextracomponents 2.0 as QtExtras
+// import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 Item {
     id: root
diff --git a/src/declarativeimports/core/private/DefaultToolTip.qml b/src/declarativeimports/core/private/DefaultToolTip.qml
index c7b5335a7..4634d74f0 100644
--- a/src/declarativeimports/core/private/DefaultToolTip.qml
+++ b/src/declarativeimports/core/private/DefaultToolTip.qml
@@ -22,7 +22,7 @@ import QtQuick.Layouts 1.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
-import org.kde.qtextracomponents 2.0 as QtExtras
+import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
 
 
 
diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
index 2e9fedd9b..cca5bfcb1 100644
--- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
+++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/EditBubble.qml
@@ -19,7 +19,7 @@
 
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 
 PlasmaCore.FrameSvgItem {
     id: editBubble
diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml
index 7ee3d3ed5..87eeea144 100644
--- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml
+++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextArea.qml
@@ -19,7 +19,7 @@
 
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 import "EditBubble.js" as EditBubbleHelper
 
 Item {
diff --git a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
index bdad67b2c..8d0e5172b 100644
--- a/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
+++ b/src/declarativeimports/plasmacomponents/platformcomponents/touch/TextField.qml
@@ -19,7 +19,7 @@
 
 import QtQuick 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 import "EditBubble.js" as EditBubbleHelper
 
 Item {
diff --git a/src/declarativeimports/plasmacomponents/qml/ProgressBar.qml b/src/declarativeimports/plasmacomponents/qml/ProgressBar.qml
index 9130a572d..f3039269f 100644
--- a/src/declarativeimports/plasmacomponents/qml/ProgressBar.qml
+++ b/src/declarativeimports/plasmacomponents/qml/ProgressBar.qml
@@ -20,7 +20,7 @@
 import QtQuick 2.1
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 
 /**
  * Simple progressBar using the plasma theme.
diff --git a/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml b/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
index f80330adb..8857b573a 100644
--- a/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
+++ b/src/declarativeimports/plasmacomponents/qml/private/TabBarLayout.qml
@@ -55,7 +55,7 @@ Properties:
 **/
 
 import QtQuick 2.1
-import org.kde.qtextracomponents 2.0
+import org.kde.kquickcontrolsaddons 2.0
 import "AppManager.js" as Utils
 
 Item {
diff --git a/tools/port-plasma2.sh b/tools/port-plasma2.sh
index d4f398339..321624d09 100755
--- a/tools/port-plasma2.sh
+++ b/tools/port-plasma2.sh
@@ -154,3 +154,15 @@ for FS in `find $PWD -type f -name '*main.qml'`; do
     perl -p -i -e 's/QtQuick 2.0/QtQuick 2.0\nimport org.kde.plasma.plasmoid 2.0/g' $FS
 done
 
+for FS in `find $PWD  -name '*.qml'`; do
+    perl -p -i -e 's/org.kde.qtextracomponents/org.kde.kquickcontrolsaddons/g' $FS
+done
+
+for FS in `find $PWD  -name '*.qml'`; do
+    perl -p -i -e 's/QtExtras/KQuickControlsAddons/g' $FS
+done
+
+for FS in `find $PWD  -name '*.qml'`; do
+    perl -p -i -e 's/QtExtra/KQuickControlsAddons/g' $FS
+done
+