diff --git a/apis/StorageManager/IStorageManager.h b/apis/AppStorageManager/IAppStorageManager.h
similarity index 96%
rename from apis/StorageManager/IStorageManager.h
rename to apis/AppStorageManager/IAppStorageManager.h
index 482e7a2e..25bdff71 100644
--- a/apis/StorageManager/IStorageManager.h
+++ b/apis/AppStorageManager/IAppStorageManager.h
@@ -24,9 +24,9 @@
 namespace WPEFramework {
 namespace Exchange {
 // @json 1.0.0 @text:keep
-struct EXTERNAL IStorageManager : virtual public Core::IUnknown {
+struct EXTERNAL IAppStorageManager : virtual public Core::IUnknown {
 
-    enum { ID = ID_STORAGEMANAGER };
+    enum { ID = ID_APPSTORAGEMANAGER };
 
     /** Create Storage for a given appId */
     // @json:omit
diff --git a/apis/Ids.h b/apis/Ids.h
index d1476677..d5007fe9 100755
--- a/apis/Ids.h
+++ b/apis/Ids.h
@@ -254,7 +254,7 @@ namespace Exchange {
         ID_PACKAGE_KEY_VALUE_ITERATOR                = ID_APP_PACKAGE_MANAGER + 9,
         ID_PACKAGE_LOCK_ITERATOR                     = ID_APP_PACKAGE_MANAGER + 10,
 
-	ID_STORAGEMANAGER                            = ID_ENTOS_OFFSET + 0x310,
+	ID_APPSTORAGEMANAGER                            = ID_ENTOS_OFFSET + 0x310,
 
         ID_AUTHSERVICE                               = ID_ENTOS_OFFSET + 0x320,
         ID_AUTHSERVICE_NOTIFICATION                  = ID_AUTHSERVICE + 1,
diff --git a/docs/_sidebar.md b/docs/_sidebar.md
index 48978778..886cf727 100755
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -6,6 +6,7 @@
   - [Analytics](apis/Analytics.md)
   - [AppGateway](apis/AppGateway.md)
   - [AppManager](apis/AppManager.md)
+  - [AppStorageManager](apis/AppStorageManager.md)
   - [AVInput](apis/AVInput.md)
   - [Bluetooth<sup>@</sup>](apis/BluetoothPlugin.md)
   - [DeviceDiagnostics](apis/DeviceDiagnostics.md)
@@ -49,7 +50,6 @@
   - [ResourceManager<sup>@</sup>](apis/ResourceManagerPlugin.md)
   - [ScreenCapture](apis/ScreenCapture.md)
   - [SharedStorage](apis/SharedStorage.md)
-  - [StorageManager](apis/StorageManager.md)
   - [SystemAudioPlayer<sup>@</sup>](apis/SystemAudioPlayerPlugin.md)
   - [SystemMode](apis/SystemMode.md)
   - [System<sup>@</sup>](apis/SystemPlugin.md)
diff --git a/docs/apis/StorageManager.md b/docs/apis/AppStorageManager.md
similarity index 75%
rename from docs/apis/StorageManager.md
rename to docs/apis/AppStorageManager.md
index d5ea0870..de0630e2 100644
--- a/docs/apis/StorageManager.md
+++ b/docs/apis/AppStorageManager.md
@@ -1,10 +1,10 @@
 <!-- Generated automatically, DO NOT EDIT! -->
-<a id="StorageManager_Plugin"></a>
-# StorageManager Plugin
+<a id="AppStorageManager_Plugin"></a>
+# AppStorageManager Plugin
 
-**Version: [1.0.0](https://github.com/rdkcentral/entservices-apis/tree/main/apis/StorageManager/IStorageManager.h)**
+**Version: [1.0.0](https://github.com/rdkcentral/entservices-apis/tree/main/apis/AppStorageManager/IAppStorageManager.h)**
 
-A StorageManager plugin for Thunder framework.
+A AppStorageManager plugin for Thunder framework.
 
 ### Table of Contents
 
@@ -21,7 +21,7 @@ A StorageManager plugin for Thunder framework.
 <a id="Description"></a>
 # Description
 
-The `StorageManager` plugin provides an interface for StorageManager.
+The `AppStorageManager` plugin provides an interface for AppStorageManager.
 
 The plugin is designed to be loaded and executed within the Thunder framework. For more information about the framework refer to [[Thunder](https://rdkcentral.github.io/Thunder/)].
 
@@ -32,17 +32,17 @@ The table below lists configuration options of the plugin.
 
 | Name | Type | Description |
 | :-------- | :-------- | :-------- |
-| callsign | string | Plugin instance name (default: org.rdk.StorageManager) |
-| classname | string | Class name: *StorageManager* |
-| locator | string | Library name: *libWPEFrameworkStorageManager.so* |
+| callsign | string | Plugin instance name (default: org.rdk.AppStorageManager) |
+| classname | string | Class name: *AppStorageManager* |
+| locator | string | Library name: *libWPEFrameworkAppStorageManager.so* |
 | autostart | boolean | Determines if the plugin shall be started automatically along with the framework |
 
 <a id="Methods"></a>
 # Methods
 
-The following methods are provided by the StorageManager plugin:
+The following methods are provided by the AppStorageManager plugin:
 
-StorageManager interface methods:
+AppStorageManager interface methods:
 
 | Method | Description |
 | :-------- | :-------- |
@@ -76,7 +76,7 @@ Event details will be updated soon.
 {
     "jsonrpc": 2.0,
     "id": 0,
-    "method": "org.rdk.StorageManager.clear",
+    "method": "org.rdk.AppStorageManager.clear",
     "params": {
         "appId": ""
     }
@@ -87,7 +87,7 @@ Event details will be updated soon.
 #### CURL Command
 
 ```curl
-curl -H 'content-type:text/plain;' --data-binary '{"jsonrpc": 2.0, "id": 0, "method": "org.rdk.StorageManager.clear", "params": {"appId": ""}}' http://127.0.0.1:9998/jsonrpc
+curl -H 'content-type:text/plain;' --data-binary '{"jsonrpc": 2.0, "id": 0, "method": "org.rdk.AppStorageManager.clear", "params": {"appId": ""}}' http://127.0.0.1:9998/jsonrpc
 ```
 
 
@@ -130,7 +130,7 @@ Event details will be updated soon.
 {
     "jsonrpc": 2.0,
     "id": 1,
-    "method": "org.rdk.StorageManager.clearAll",
+    "method": "org.rdk.AppStorageManager.clearAll",
     "params": {
         "exemptionAppIds": ""
     }
@@ -141,7 +141,7 @@ Event details will be updated soon.
 #### CURL Command
 
 ```curl
-curl -H 'content-type:text/plain;' --data-binary '{"jsonrpc": 2.0, "id": 1, "method": "org.rdk.StorageManager.clearAll", "params": {"exemptionAppIds": ""}}' http://127.0.0.1:9998/jsonrpc
+curl -H 'content-type:text/plain;' --data-binary '{"jsonrpc": 2.0, "id": 1, "method": "org.rdk.AppStorageManager.clearAll", "params": {"exemptionAppIds": ""}}' http://127.0.0.1:9998/jsonrpc
 ```