diff --git a/app/config/services.php b/app/config/services.php
index 696184d0c5..f02f169b88 100644
--- a/app/config/services.php
+++ b/app/config/services.php
@@ -66,15 +66,15 @@ return [
         'optional' => true,
         'icon' => '/images/services/databases.png',
     ],
-    'tables' => [
-        'key' => 'tables',
-        'name' => 'Tables',
-        'subtitle' => 'The Tables service allows you to create structured tables of rows, query and filter lists of rows',
-        'description' => '/docs/services/tables.md',
+    'tablesdb' => [
+        'key' => 'tablesdb',
+        'name' => 'TablesDB',
+        'subtitle' => 'The TablesDB service allows you to create structured tables of columns, query and filter lists of rows',
+        'description' => '/docs/services/tablesdb.md',
         'controller' => '', // Uses modules
         'sdk' => true,
         'docs' => true,
-        'docsUrl' => 'https://appwrite.io/docs/client/tables',
+        'docsUrl' => 'https://appwrite.io/docs/client/tablesdb',
         'tests' => false,
         'optional' => true,
         'icon' => '/images/services/databases.png',
diff --git a/docs/services/tables.md b/docs/services/tables.md
deleted file mode 100644
index f0c252db30..0000000000
--- a/docs/services/tables.md
+++ /dev/null
@@ -1,7 +0,0 @@
-The Tables service allows you to create structured tables of rows, query and filter lists of rows, and manage an advanced set of read and write access permissions.
-
-All data returned by the Tables service are represented as structured JSON objects.
-
-The Tables service can contain multiple databases, each database can contain multiple tables. A table is a group of similarly structured rows. The accepted structure of rows is defined by [table columns](https://appwrite.io/docs/databases#columns). The table columns help you ensure all your user-submitted data is validated and stored according to the table structure.
-
-Using Appwrite permissions architecture, you can assign read or write access to each table or row in your project for either a specific user, team, user role, or even grant it with public access (`any`). You can learn more about [how Appwrite handles permissions and access control](https://appwrite.io/docs/permissions).
\ No newline at end of file
diff --git a/docs/services/tablesdb.md b/docs/services/tablesdb.md
new file mode 100644
index 0000000000..b64fb92e34
--- /dev/null
+++ b/docs/services/tablesdb.md
@@ -0,0 +1,7 @@
+The TablesDB service allows you to create structured tables of rows, query and filter lists of rows, and manage an advanced set of read and write access permissions.
+
+All data returned by the TablesDB service are represented as structured JSON objects.
+
+The TablesDB service can contain multiple databases, each database can contain multiple tables. A table is a group of similarly structured rows. The accepted structure of rows is defined by [table columns](https://appwrite.io/docs/databases#columns). The table columns help you ensure all your user-submitted data is validated and stored according to the table structure.
+
+Using Appwrite permissions architecture, you can assign read or write access to each table or row in your project for either a specific user, team, user role, or even grant it with public access (`any`). You can learn more about [how Appwrite handles permissions and access control](https://appwrite.io/docs/permissions).
\ No newline at end of file
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/Get.php
index b73e459a2e..69b1fb088d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/Get.php
@@ -39,7 +39,7 @@ class Get extends Action
                 new Method(
                     namespace: 'databases',
                     group: null,
-                    name: self::getName(),
+                    name: 'getUsage',
                     description: '/docs/references/databases/get-database-usage.md',
                     auth: [AuthType::ADMIN],
                     responses: [
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/XList.php
index 0870eb1fc9..bf8a53677b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/XList.php
@@ -37,7 +37,7 @@ class XList extends Action
                 new Method(
                     namespace: 'databases',
                     group: null,
-                    name: self::getName(),
+                    name: 'listUsage',
                     description: '/docs/references/databases/list-usage.md',
                     auth: [AuthType::ADMIN],
                     responses: [
diff --git a/src/Appwrite/SDK/Specification/Format.php b/src/Appwrite/SDK/Specification/Format.php
index 8fabe70593..22286ad8a9 100644
--- a/src/Appwrite/SDK/Specification/Format.php
+++ b/src/Appwrite/SDK/Specification/Format.php
@@ -479,10 +479,9 @@ abstract class Format
                 break;
             case 'databases':
                 switch ($method) {
-                    /*case 'getUsage':*/
+                    case 'getUsage':
                     case 'listUsage':
                     case 'getCollectionUsage':
-                    case 'getDatabaseUsage':
                         // Range Enum Keys
                         return ['Twenty Four Hours', 'Thirty Days', 'Ninety Days'];
                 }