diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index 8f989a4df..ee1ba1f30 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -158,7 +158,7 @@ Item {
         }
 
         for(var i=0; i<layoutsContainer.endLayout.count; ++i){
-            if(layoutsContainer.endLayout.children[i] === container){
+            if(layoutsContainer.endLayout.children[i] === appletItem){
                 //create a very high index in order to not need to exchange hovering messages
                 //between layoutsContainer.mainLayout and layoutsContainer.endLayout
                 index = layoutsContainer.endLayout.beginIndex + i;
diff --git a/plasmoid/package/contents/ui/ParabolicManager.qml b/plasmoid/package/contents/ui/ParabolicManager.qml
index 1b25f0359..6f43026a6 100644
--- a/plasmoid/package/contents/ui/ParabolicManager.qml
+++ b/plasmoid/package/contents/ui/ParabolicManager.qml
@@ -523,7 +523,7 @@ Item {
         return (posOfLauncherToBeMoved(launcher) >= 0);
     }
 
-    //!Trying to avoid a binding loop in TaskDelegate for modelLauncherUrl
+    //!Trying to avoid a binding loop in TaskItem for modelLauncherUrl
     Timer {
         id: launchersToBeMovedTimer
         interval: 50
diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index 605694641..22ccd216a 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -1211,7 +1211,7 @@ Item {
 
             orientation: Qt.Horizontal
 
-            delegate: Task.TaskDelegate{}
+            delegate: Task.TaskItem{}
 
             /* Rectangle{
                 anchors.fill: parent
@@ -1244,7 +1244,7 @@ Item {
 
                     var choords = mapFromItem(task,0, 0);
 
-                    if( (task.objectName==="TaskDelegate") && (x>=choords.x) && (x<=choords.x+task.width)
+                    if( (task.objectName==="TaskItem") && (x>=choords.x) && (x<=choords.x+task.width)
                             && (y>=choords.y) && (y<=choords.y+task.height)){
                         return task;
                     }
diff --git a/plasmoid/package/contents/ui/task/TaskActiveItem.qml b/plasmoid/package/contents/ui/task/ActiveItem.qml
similarity index 100%
rename from plasmoid/package/contents/ui/task/TaskActiveItem.qml
rename to plasmoid/package/contents/ui/task/ActiveItem.qml
diff --git a/plasmoid/package/contents/ui/task/TaskGroupItem.qml b/plasmoid/package/contents/ui/task/GroupItem.qml
similarity index 100%
rename from plasmoid/package/contents/ui/task/TaskGroupItem.qml
rename to plasmoid/package/contents/ui/task/GroupItem.qml
diff --git a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml b/plasmoid/package/contents/ui/task/HiddenSpacer.qml
similarity index 99%
rename from plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml
rename to plasmoid/package/contents/ui/task/HiddenSpacer.qml
index fde1d4c54..88edaec34 100644
--- a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml
+++ b/plasmoid/package/contents/ui/task/HiddenSpacer.qml
@@ -40,7 +40,7 @@ Item{
     //fix #846,empty tasks after activity changes
     //in some cases after activity changes some tasks
     //are shown empty because some ghost tasks are created.
-    //This was tracked down to hidden TaskDelegates spacers.
+    //This was tracked down to hidden TaskItems spacers.
     //the flag !root.inActivityChange protects from this
     //and it is used later on Behaviors in order to not break
     //the activity change animations from removal/additions of tasks
diff --git a/plasmoid/package/contents/ui/task/TaskIconItem.qml b/plasmoid/package/contents/ui/task/IconItem.qml
similarity index 99%
rename from plasmoid/package/contents/ui/task/TaskIconItem.qml
rename to plasmoid/package/contents/ui/task/IconItem.qml
index 97d79e148..7a03a9964 100644
--- a/plasmoid/package/contents/ui/task/TaskIconItem.qml
+++ b/plasmoid/package/contents/ui/task/IconItem.qml
@@ -424,7 +424,7 @@ Item{
         "
                 } //end of sourceComponent
 
-                TaskProgressOverlay{
+                ProgressOverlay{
                     id: infoBadge
                     anchors.fill:parent
                     opacity: badgesLoader.opacityN
diff --git a/plasmoid/package/contents/ui/task/TaskProgressOverlay.qml b/plasmoid/package/contents/ui/task/ProgressOverlay.qml
similarity index 100%
rename from plasmoid/package/contents/ui/task/TaskProgressOverlay.qml
rename to plasmoid/package/contents/ui/task/ProgressOverlay.qml
diff --git a/plasmoid/package/contents/ui/task/TaskWindows.qml b/plasmoid/package/contents/ui/task/SubWindows.qml
similarity index 100%
rename from plasmoid/package/contents/ui/task/TaskWindows.qml
rename to plasmoid/package/contents/ui/task/SubWindows.qml
diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskItem.qml
similarity index 98%
rename from plasmoid/package/contents/ui/task/TaskDelegate.qml
rename to plasmoid/package/contents/ui/task/TaskItem.qml
index b67b32515..0ff5f2e4f 100644
--- a/plasmoid/package/contents/ui/task/TaskDelegate.qml
+++ b/plasmoid/package/contents/ui/task/TaskItem.qml
@@ -42,7 +42,7 @@ MouseArea{
     anchors.left: (root.position === PlasmaCore.Types.LeftPositioned) ? parent.left : undefined
     anchors.right: (root.position === PlasmaCore.Types.RightPositioned) ? parent.right : undefined
 
-    objectName: "TaskDelegate"
+    objectName: "TaskItem"
 
     width: {
         if (!visible)
@@ -94,8 +94,8 @@ MouseArea{
     property bool scalesUpdatedOnce: false
     //states that exist in windows in a Group of windows
     property bool hasActive: isActive
-    property bool hasMinimized: (IsGroupParent === true) ? tasksWindows.hasMinimized : isMinimized
-    property bool hasShown: (IsGroupParent === true) ? tasksWindows.hasShown : !isMinimized
+    property bool hasMinimized: (IsGroupParent === true) ? subWindows.hasMinimized : isMinimized
+    property bool hasShown: (IsGroupParent === true) ? subWindows.hasShown : !isMinimized
     property bool inAddRemoveAnimation: true
     property bool inAnimation: true
     property bool inAttentionAnimation: false
@@ -226,8 +226,8 @@ MouseArea{
         NumberAnimation { duration: root.durationTime*units.longDuration }
     }
 
-    TaskWindows{
-        id: tasksWindows
+    SubWindows{
+        id: subWindows
 
         property int previousCount: 0
 
@@ -431,12 +431,12 @@ MouseArea{
 
         // a hidden spacer for the first element to add stability
         // IMPORTANT: hidden spacers must be tested on vertical !!!
-        TaskHiddenSpacer{ id:hiddenSpacerLeft;}
+        HiddenSpacer{ id:hiddenSpacerLeft;}
 
-        TaskWrapper{ id: wrapper }
+        Wrapper{ id: wrapper }
 
         // a hidden spacer on the right for the last item to add stability
-        TaskHiddenSpacer{ id:hiddenSpacerRight; rightSpacer: true }
+        HiddenSpacer{ id:hiddenSpacerRight; rightSpacer: true }
     }// Flow with hidden spacers inside
 
     /*Rectangle{
@@ -818,7 +818,7 @@ MouseArea{
                         tasksModel.requestToggleMinimized(modelIndex());
                     } else if ( root.modifierClickAction == Latte.Types.CycleThroughTasks) {
                         if (isGroupParent)
-                            tasksWindows.activateNextTask();
+                            subWindows.activateNextTask();
                         else
                             activateTask();
                     } else if (root.modifierClickAction == Latte.Types.ToggleGrouping) {
@@ -837,7 +837,7 @@ MouseArea{
                         tasksModel.requestToggleMinimized(modelIndex());
                     } else if ( root.middleClickAction == Latte.Types.CycleThroughTasks) {
                         if (isGroupParent)
-                            tasksWindows.activateNextTask();
+                            subWindows.activateNextTask();
                         else
                             activateTask();
                     } else if (root.middleClickAction == Latte.Types.ToggleGrouping) {
@@ -852,7 +852,7 @@ MouseArea{
                         activateTask();
                     } else if (root.leftClickAction === Latte.Types.CycleThroughTasks) {
                         if (isGroupParent)
-                            tasksWindows.activateNextTask();
+                            subWindows.activateNextTask();
                         else
                             activateTask();
                     } else if (root.leftClickAction === Latte.Types.PreviewWindows) {
@@ -894,7 +894,7 @@ MouseArea{
                 inWheelAction = true;
                 wrapper.runLauncherAnimation();
             } else if (isGroupParent) {
-                tasksWindows.activateNextTask();
+                subWindows.activateNextTask();
             } else {
                 var taskIndex = modelIndex();
 
@@ -911,7 +911,7 @@ MouseArea{
             if (isLauncher || root.disableAllWindowsFunctionality) {
                 // do nothing
             } else if (isGroupParent) {
-                tasksWindows.activatePreviousTask();
+                subWindows.activatePreviousTask();
             } else {
                 var taskIndex = modelIndex();
 
@@ -969,7 +969,7 @@ MouseArea{
 
     ///// Helper functions /////
     function activateNextTask() {
-        tasksWindows.activateNextTask();
+        subWindows.activateNextTask();
     }
 
     function activateTask() {
diff --git a/plasmoid/package/contents/ui/task/TaskWrapper.qml b/plasmoid/package/contents/ui/task/Wrapper.qml
similarity index 99%
rename from plasmoid/package/contents/ui/task/TaskWrapper.qml
rename to plasmoid/package/contents/ui/task/Wrapper.qml
index f4115aa2e..401205d78 100644
--- a/plasmoid/package/contents/ui/task/TaskWrapper.qml
+++ b/plasmoid/package/contents/ui/task/Wrapper.qml
@@ -155,7 +155,7 @@ Item{
             visible: active
 
             sourceComponent: Component{
-                TaskGroupItem{}
+                GroupItem{}
             }
         }
 
@@ -186,7 +186,7 @@ Item{
             }
         }
 
-        TaskIconItem{ id: taskIconItem}
+        IconItem{ id: taskIconItem}
 
         //! This is used from bouncing attention animation in order to played correctly
         Loader{
@@ -222,7 +222,7 @@ Item{
             visible: active
 
             sourceComponent: Component{
-                TaskGroupItem{}
+                GroupItem{}
             }
         }