diff --git a/systemd/system/wpeframework-storagemanager.service b/systemd/system/wpeframework-appstoragemanager.service
similarity index 60%
rename from systemd/system/wpeframework-storagemanager.service
rename to systemd/system/wpeframework-appstoragemanager.service
index 3c3937c..8cecf8c 100644
--- a/systemd/system/wpeframework-storagemanager.service
+++ b/systemd/system/wpeframework-appstoragemanager.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=WPEFramework StorageManager Initialiser
+Description=WPEFramework AppStorageManager Initialiser
 Requires= wpeframework.service
 After= wpeframework.service
 ConditionPathExists=/opt/ai2managers
@@ -8,5 +8,5 @@ ConditionPathExists=/tmp/wpeframeworkstarted
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/bin/PluginActivator org.rdk.StorageManager
+ExecStart=/usr/bin/PluginActivator org.rdk.AppStorageManager
 
diff --git a/systemd/system/wpeframework-downloadmanager.service b/systemd/system/wpeframework-downloadmanager.service
index 8b62791..b17d9e2 100755
--- a/systemd/system/wpeframework-downloadmanager.service
+++ b/systemd/system/wpeframework-downloadmanager.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework DownloadManager Initialiser
-Requires= wpeframework.service wpeframework-storagemanager.service
-After= wpeframework.service wpeframework-storagemanager.service
+Requires= wpeframework.service wpeframework-appstoragemanager.service
+After= wpeframework.service wpeframework-appstoragemanager.service
 ConditionPathExists=/opt/ai2managers
 ConditionPathExists=/tmp/wpeframeworkstarted
 
diff --git a/systemd/system/wpeframework-packagemanager.service b/systemd/system/wpeframework-packagemanager.service
index fff8a89..2bc8ac9 100644
--- a/systemd/system/wpeframework-packagemanager.service
+++ b/systemd/system/wpeframework-packagemanager.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework PackageManagerRDKEMS Initialiser
-Requires= wpeframework.service wpeframework-storagemanager.service
-After= wpeframework.service wpeframework-storagemanager.service
+Requires= wpeframework.service wpeframework-appstoragemanager.service
+After= wpeframework.service wpeframework-appstoragemanager.service
 ConditionPathExists=/opt/ai2managers
 ConditionPathExists=/tmp/wpeframeworkstarted
 
diff --git a/systemd/system/wpeframework-runtimemanager.service b/systemd/system/wpeframework-runtimemanager.service
index 388af6d..f7d7097 100755
--- a/systemd/system/wpeframework-runtimemanager.service
+++ b/systemd/system/wpeframework-runtimemanager.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=WPEFramework RuntimeManager Initialiser
-Requires= wpeframework.service wpeframework-storagemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service wpeframework-telemetrymetrics.service
-After= wpeframework.service wpeframework-storagemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service wpeframework-telemetrymetrics.service
+Requires= wpeframework.service wpeframework-appstoragemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service wpeframework-telemetrymetrics.service
+After= wpeframework.service wpeframework-appstoragemanager.service wpeframework-rdkwindowmanager.service wpeframework-ocicontainer.service wpeframework-telemetrymetrics.service
 ConditionPathExists=/opt/ai2managers
 ConditionPathExists=/tmp/wpeframeworkstarted