diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Usage/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/Get.php
similarity index 87%
rename from src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Usage/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/Get.php
index abb6b7a501..378c935dca 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases\Usage;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Usage;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Usage\Get as DatabaseUsageGet;
 use Appwrite\SDK\AuthType;
@@ -16,7 +16,7 @@ class Get extends DatabaseUsageGet
 {
     public static function getName(): string
     {
-        return 'getTablesDatabaseUsage';
+        return 'getUsage';
     }
 
     public function __construct()
@@ -24,16 +24,16 @@ class Get extends DatabaseUsageGet
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
             ->setHttpPath('/v1/tablesdb/:databaseId/usage')
-            ->desc('Get database usage stats')
+            ->desc('Get TablesDB usage stats')
             ->groups(['api', 'database', 'usage'])
-            ->label('scope', 'collections.read')
+            ->label('scope', 'tables.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', [
                 new Method(
                     namespace: 'tablesdb',
                     group: null,
                     name: 'getDatabaseUsage',
-                    description: '/docs/references/tablesdb/get-database-usage.md',
+                    description: '/docs/references/tablesdb/get-usage.md',
                     auth: [AuthType::ADMIN],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Usage/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/XList.php
similarity index 86%
rename from src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Usage/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/XList.php
index 95189011c1..7956096fca 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Usage/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases\Usage;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Usage;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Usage\XList as DatabaseUsageXList;
 use Appwrite\SDK\AuthType;
@@ -15,7 +15,7 @@ class XList extends DatabaseUsageXList
 {
     public static function getName(): string
     {
-        return 'listTablesDatabaseUsage';
+        return 'listUsage';
     }
 
     public function __construct()
@@ -23,16 +23,16 @@ class XList extends DatabaseUsageXList
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
             ->setHttpPath('/v1/tablesdb/usage')
-            ->desc('Get databases usage stats')
+            ->desc('Get TablesDB usage stats')
             ->groups(['api', 'database', 'usage'])
-            ->label('scope', 'collections.read')
+            ->label('scope', 'tables.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', [
                 new Method(
                     namespace: 'tablesdb',
                     group: null,
                     name: 'listDatabaseUsage',
-                    description: '/docs/references/tablesdb/list-database-usage.md',
+                    description: '/docs/references/tablesdb/list-usage.md',
                     auth: [AuthType::ADMIN],
                     responses: [
                         new SDKResponse(