diff --git a/containment/package/contents/ui/abilities/Debug.qml b/containment/package/contents/ui/abilities/Debug.qml
index a745a65cc..b260043d3 100644
--- a/containment/package/contents/ui/abilities/Debug.qml
+++ b/containment/package/contents/ui/abilities/Debug.qml
@@ -20,10 +20,10 @@
 import QtQuick 2.7
 import org.kde.plasma.plasmoid 2.0
 
-import org.kde.latte.abilities.containers 0.1 as ContainerAbility
 import org.kde.latte.abilities.definitions 0.1 as AbilityDefinition
+import org.kde.latte.abilities.hosts 0.1 as AbilityHost
 
-ContainerAbility.Debug {
+AbilityHost.Debug {
     graphicsEnabled: Qt.application.arguments.indexOf("--graphics")>=0
     inputMaskEnabled: Qt.application.arguments.indexOf("--input")>=0
     layouterEnabled: Qt.application.arguments.indexOf("--layouter")>=0
diff --git a/containment/package/contents/ui/abilities/privates/AnimationsPrivate.qml b/containment/package/contents/ui/abilities/privates/AnimationsPrivate.qml
index e4843ebc3..8616be7f1 100644
--- a/containment/package/contents/ui/abilities/privates/AnimationsPrivate.qml
+++ b/containment/package/contents/ui/abilities/privates/AnimationsPrivate.qml
@@ -20,9 +20,9 @@
 import QtQuick 2.7
 import org.kde.plasma.plasmoid 2.0
 
-import org.kde.latte.abilities.containers 0.1 as ContainerAbility
+import org.kde.latte.abilities.hosts 0.1 as AbilityHost
 
-ContainerAbility.Animations {
+AbilityHost.Animations {
     id: animationsPrivate
     property Item layouts: null
     property Item metrics: null
diff --git a/containment/package/contents/ui/abilities/privates/MetricsPrivate.qml b/containment/package/contents/ui/abilities/privates/MetricsPrivate.qml
index d4a09fb3d..5f9c1d01c 100644
--- a/containment/package/contents/ui/abilities/privates/MetricsPrivate.qml
+++ b/containment/package/contents/ui/abilities/privates/MetricsPrivate.qml
@@ -21,11 +21,11 @@ import QtQuick 2.7
 import org.kde.plasma.plasmoid 2.0
 
 import org.kde.latte.core 0.2 as LatteCore
-import org.kde.latte.abilities.containers 0.1 as ContainerAbility
+import org.kde.latte.abilities.hosts 0.1 as AbilityHost
 
 import "./metrics" as MetricsPrivateTypes
 
-ContainerAbility.Metrics {
+AbilityHost.Metrics {
     id: mets
     property Item animations: null
     property Item autosize: null
diff --git a/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml b/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml
index 3f8134472..996f45b69 100644
--- a/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml
+++ b/containment/package/contents/ui/abilities/privates/ParabolicEffectPrivate.qml
@@ -24,9 +24,9 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 
 import org.kde.latte.core 0.2 as LatteCore
 
-import org.kde.latte.abilities.containers 0.1 as ContainerAbility
+import org.kde.latte.abilities.hosts 0.1 as AbilityHost
 
-ContainerAbility.ParabolicEffect {
+AbilityHost.ParabolicEffect {
     id: parabolic
 
     property Item animations: null
diff --git a/declarativeimports/abilities/bridge/ParabolicEffect.qml b/declarativeimports/abilities/bridge/ParabolicEffect.qml
index f55f34e86..035caf809 100644
--- a/declarativeimports/abilities/bridge/ParabolicEffect.qml
+++ b/declarativeimports/abilities/bridge/ParabolicEffect.qml
@@ -32,7 +32,7 @@ BridgeItem {
 
   /*Be Careful, needs to be considered how to not create
     endless recursion because each one calls the other.
-    If applet in inside a container and as such is using
+    If client in inside a container and as such is using
     a parabolic host then the parabolic host clearZoom signal
     should be called when needed.
 
diff --git a/declarativeimports/abilities/containers/Animations.qml b/declarativeimports/abilities/hosts/Animations.qml
similarity index 100%
rename from declarativeimports/abilities/containers/Animations.qml
rename to declarativeimports/abilities/hosts/Animations.qml
diff --git a/declarativeimports/abilities/containers/Debug.qml b/declarativeimports/abilities/hosts/Debug.qml
similarity index 100%
rename from declarativeimports/abilities/containers/Debug.qml
rename to declarativeimports/abilities/hosts/Debug.qml
diff --git a/declarativeimports/abilities/containers/Metrics.qml b/declarativeimports/abilities/hosts/Metrics.qml
similarity index 100%
rename from declarativeimports/abilities/containers/Metrics.qml
rename to declarativeimports/abilities/hosts/Metrics.qml
diff --git a/declarativeimports/abilities/containers/ParabolicEffect.qml b/declarativeimports/abilities/hosts/ParabolicEffect.qml
similarity index 100%
rename from declarativeimports/abilities/containers/ParabolicEffect.qml
rename to declarativeimports/abilities/hosts/ParabolicEffect.qml
diff --git a/declarativeimports/abilities/containers/qmldir b/declarativeimports/abilities/hosts/qmldir
similarity index 73%
rename from declarativeimports/abilities/containers/qmldir
rename to declarativeimports/abilities/hosts/qmldir
index a5a677c96..abfceba01 100644
--- a/declarativeimports/abilities/containers/qmldir
+++ b/declarativeimports/abilities/hosts/qmldir
@@ -1,4 +1,4 @@
-module org.kde.latte.abilities.containers
+module org.kde.latte.abilities.hosts
 
 Animations 0.1 Animations.qml
 Debug 0.1 Debug.qml