diff --git a/app/config/collections/projects.php b/app/config/collections/projects.php
index 9f9bba75da..dce0e39e92 100644
--- a/app/config/collections/projects.php
+++ b/app/config/collections/projects.php
@@ -56,7 +56,7 @@ return [
                 'type' => Database::VAR_STRING,
                 'size' => 128,
                 'required' => false,
-                'default' => 'grids',
+                'default' => 'tablesdb',
                 'signed' => true,
                 'array' => false,
                 'filters' => [],
diff --git a/composer.lock b/composer.lock
index 4321d88110..3d49975acc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8407,7 +8407,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
@@ -8431,5 +8431,5 @@
     "platform-overrides": {
         "php": "8.3"
     },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
index e7c9814655..edc361d266 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
@@ -20,9 +20,7 @@ abstract class Action extends UtopiaAction
 
     public function setHttpPath(string $path): UtopiaAction
     {
-        if (str_contains($path, '/:databaseId/grids/tables')) {
-            $this->context = TABLES;
-        }
+        // Context is automatically set by Documents/Action.php setHttpPath for tablesdb paths
 
         return parent::setHttpPath($path);
     }
@@ -64,7 +62,7 @@ abstract class Action extends UtopiaAction
      */
     final protected function getSdkNamespace(): string
     {
-        return $this->isCollectionsAPI() ? 'databases' : 'grids';
+        return $this->isCollectionsAPI() ? 'databases' : 'tablesdb';
     }
 
     /**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php
index 765741ef41..11c9eb1502 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Action.php
@@ -37,9 +37,7 @@ abstract class Action extends UtopiaAction
 
     public function setHttpPath(string $path): UtopiaAction
     {
-        if (str_contains($path, '/:databaseId/grids/tables')) {
-            $this->context = COLUMNS;
-        }
+        // Context is automatically set by Documents/Action.php setHttpPath for tablesdb paths
 
         return parent::setHttpPath($path);
     }
@@ -77,7 +75,7 @@ abstract class Action extends UtopiaAction
      */
     final protected function getSdkNamespace(): string
     {
-        return $this->isCollectionsAPI() ? 'databases' : 'grids';
+        return $this->isCollectionsAPI() ? 'databases' : 'tablesdb';
     }
 
     /**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php
index ba44cf5900..770ad45b17 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Create.php
@@ -55,7 +55,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createBooleanColumn',
+                    replaceWith: 'tablesdb.createBooleanColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Update.php
index 2c46e457b8..455ade6a2e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Boolean/Update.php
@@ -56,7 +56,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateBooleanColumn',
+                    replaceWith: 'tablesdb.updateBooleanColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php
index 693b87726e..7afe396f71 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Create.php
@@ -56,7 +56,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createDatetimeColumn',
+                    replaceWith: 'tablesdb.createDatetimeColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Update.php
index 3bc76b5ecb..882fb1f6f5 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Datetime/Update.php
@@ -57,7 +57,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateDatetimeColumn',
+                    replaceWith: 'tablesdb.updateDatetimeColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php
index c86bb956f9..973e883bf6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Delete.php
@@ -57,7 +57,7 @@ class Delete extends Action
                 contentType: ContentType::NONE,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.deleteColumn',
+                    replaceWith: 'tablesdb.deleteColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php
index 6638622bae..ce1111f772 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Create.php
@@ -56,7 +56,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createEmailColumn',
+                    replaceWith: 'tablesdb.createEmailColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Update.php
index 66d0e611b4..a480eb54ad 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Email/Update.php
@@ -57,7 +57,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateEmailColumn',
+                    replaceWith: 'tablesdb.updateEmailColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php
index 414aa12e1b..6979a3599a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Create.php
@@ -58,7 +58,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createEnumColumn',
+                    replaceWith: 'tablesdb.createEnumColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Update.php
index 201af5c394..ab036fb584 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Enum/Update.php
@@ -58,7 +58,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateEnumColumn',
+                    replaceWith: 'tablesdb.updateEnumColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php
index 4d2bb1f827..bcc30750ab 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Create.php
@@ -58,7 +58,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createFloatColumn',
+                    replaceWith: 'tablesdb.createFloatColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Update.php
index 74e81210be..b48cb5b2c1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Float/Update.php
@@ -57,7 +57,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateFloatColumn',
+                    replaceWith: 'tablesdb.updateFloatColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Get.php
index 5fedfc608a..f1e5535fd9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Get.php
@@ -60,7 +60,7 @@ class Get extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.getColumn',
+                    replaceWith: 'tablesdb.getColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php
index a022fe39a9..e41cbf4c6f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Create.php
@@ -56,7 +56,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createIpColumn',
+                    replaceWith: 'tablesdb.createIpColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Update.php
index 70495b1755..5a57613453 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/IP/Update.php
@@ -57,7 +57,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateIpColumn',
+                    replaceWith: 'tablesdb.updateIpColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php
index d7c345759d..547f871b48 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Create.php
@@ -58,7 +58,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createIntegerColumn',
+                    replaceWith: 'tablesdb.createIntegerColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php
index c29f634114..a61a403cf5 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Integer/Update.php
@@ -57,7 +57,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateIntegerColumn',
+                    replaceWith: 'tablesdb.updateIntegerColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php
index a4112bacd1..13afdfa109 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Create.php
@@ -58,7 +58,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createRelationshipColumn',
+                    replaceWith: 'tablesdb.createRelationshipColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Update.php
index b71d7175a0..11739c3d20 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Relationship/Update.php
@@ -55,7 +55,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateRelationshipColumn',
+                    replaceWith: 'tablesdb.updateRelationshipColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php
index d3fa0a01dc..da266c6c57 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Create.php
@@ -60,7 +60,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createStringColumn',
+                    replaceWith: 'tablesdb.createStringColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Update.php
index e450abe88a..6bfdf73fd9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/String/Update.php
@@ -59,7 +59,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateStringColumn',
+                    replaceWith: 'tablesdb.updateStringColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php
index 86474d4ca4..cf4012fcc3 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Create.php
@@ -56,7 +56,7 @@ class Create extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createUrlColumn',
+                    replaceWith: 'tablesdb.createUrlColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Update.php
index c3e6456c11..33b2d26069 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/URL/Update.php
@@ -57,7 +57,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateUrlColumn',
+                    replaceWith: 'tablesdb.updateUrlColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/XList.php
index 7b01e7c4fa..ef1da6de5f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/XList.php
@@ -54,7 +54,7 @@ class XList extends Action
                 ],
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.listColumns',
+                    replaceWith: 'tablesdb.listColumns',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
index c3fdd372ee..942c8032ad 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
@@ -65,7 +65,7 @@ class Create extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createTable',
+                    replaceWith: 'tablesdb.createTable',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
index f6755f7437..a48ade1f58 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
@@ -55,7 +55,7 @@ class Delete extends Action
                 contentType: ContentType::NONE,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.deleteTable',
+                    replaceWith: 'tablesdb.deleteTable',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
index 002c777dec..059af0f3a7 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
@@ -23,7 +23,7 @@ abstract class Action extends UtopiaAction
 
     public function setHttpPath(string $path): UtopiaAction
     {
-        if (str_contains($path, '/:databaseId/grids/tables')) {
+        if (str_contains($path, '/tablesdb/')) {
             $this->context = ROWS;
         }
 
@@ -73,7 +73,7 @@ abstract class Action extends UtopiaAction
      */
     protected function getSdkNamespace(): string
     {
-        return $this->isCollectionsAPI() ? 'databases' : 'grids';
+        return $this->isCollectionsAPI() ? 'databases' : 'tablesdb';
     }
 
     /**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php
index a97e3b97e4..b2b80b7124 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Decrement.php
@@ -66,7 +66,7 @@ class Decrement extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.decrementRowColumn',
+                    replaceWith: 'tablesdb.decrementRowColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php
index e213a347d9..ab26a1627f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Attribute/Increment.php
@@ -66,7 +66,7 @@ class Increment extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.incrementRowColumn',
+                    replaceWith: 'tablesdb.incrementRowColumn',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php
index f44e54f2b4..46ead212ce 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Delete.php
@@ -64,7 +64,7 @@ class Delete extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.deleteRows',
+                    replaceWith: 'tablesdb.deleteRows',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php
index 82b39ef178..2515d604b0 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Update.php
@@ -67,7 +67,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateRows',
+                    replaceWith: 'tablesdb.updateRows',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php
index 23e6453138..595379479c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Bulk/Upsert.php
@@ -64,7 +64,7 @@ class Upsert extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.upsertRows',
+                        replaceWith: 'tablesdb.upsertRows',
                     ),
                 )
             ])
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
index 378ab8cfd0..a230bb1bca 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
@@ -85,7 +85,7 @@ class Create extends Action
                     ],
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.createRow',
+                        replaceWith: 'tablesdb.createRow',
                     ),
                 ),
                 new Method(
@@ -109,7 +109,7 @@ class Create extends Action
                     ],
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.createRows',
+                        replaceWith: 'tablesdb.createRows',
                     ),
                 )
             ])
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Delete.php
index 7bc81ab7db..5a4ecef10e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Delete.php
@@ -65,7 +65,7 @@ class Delete extends Action
                 contentType: ContentType::NONE,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.deleteRow',
+                    replaceWith: 'tablesdb.deleteRow',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Get.php
index f3e2a24672..46802a70d6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Get.php
@@ -56,7 +56,7 @@ class Get extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.getRow',
+                    replaceWith: 'tablesdb.getRow',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
index 0f8a8688c6..154b06dfed 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Logs/XList.php
@@ -62,7 +62,7 @@ class XList extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.listRowLogs',
+                    replaceWith: 'tablesdb.listRowLogs',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
index fe08d1ed85..711e3cc828 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
@@ -69,7 +69,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateRow',
+                    replaceWith: 'tablesdb.updateRow',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
index e862896a40..cdd6e451ba 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
@@ -71,7 +71,7 @@ class Upsert extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.upsertRow',
+                        replaceWith: 'tablesdb.upsertRow',
                     ),
                 ),
             ])
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
index 42fe51e09a..59b540be2f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
@@ -59,7 +59,7 @@ class XList extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.listRows',
+                    replaceWith: 'tablesdb.listRows',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
index 3dfff2a621..6c49d5e79b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
@@ -50,7 +50,7 @@ class Get extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.getTable',
+                    replaceWith: 'tablesdb.getTable',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Action.php
index bafa9d0b91..064f6f18fb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Action.php
@@ -19,9 +19,7 @@ abstract class Action extends UtopiaAction
 
     public function setHttpPath(string $path): UtopiaAction
     {
-        if (str_contains($path, '/:databaseId/grids/tables')) {
-            $this->context = COLUMN_INDEX;
-        }
+        // Context is automatically set by Documents/Action.php setHttpPath for tablesdb paths
 
         return parent::setHttpPath($path);
     }
@@ -63,7 +61,7 @@ abstract class Action extends UtopiaAction
      */
     final protected function getSdkNamespace(): string
     {
-        return $this->isCollectionsAPI() ? 'databases' : 'grids';
+        return $this->isCollectionsAPI() ? 'databases' : 'tablesdb';
     }
 
     /**
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Create.php
index 5ba1fff5bf..21a96bfbda 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Create.php
@@ -65,7 +65,7 @@ class Create extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.createIndex',
+                    replaceWith: 'tablesdb.createIndex',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Delete.php
index 80ccd8fadf..123316161e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Delete.php
@@ -60,7 +60,7 @@ class Delete extends Action
                 contentType: ContentType::NONE,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.deleteIndex',
+                    replaceWith: 'tablesdb.deleteIndex',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Get.php
index 475835538a..a9d187884f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/Get.php
@@ -51,7 +51,7 @@ class Get extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.getIndex',
+                    replaceWith: 'tablesdb.getIndex',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/XList.php
index 643360c12d..ec4107a753 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Indexes/XList.php
@@ -56,7 +56,7 @@ class XList extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.listIndexes',
+                    replaceWith: 'tablesdb.listIndexes',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
index 359fed118a..b57d8f0850 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Logs/XList.php
@@ -62,7 +62,7 @@ class XList extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.listTableLogs',
+                    replaceWith: 'tablesdb.listTableLogs',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
index 03148eeb2b..16695abf1a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
@@ -58,7 +58,7 @@ class Update extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.updateTable',
+                    replaceWith: 'tablesdb.updateTable',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Usage/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Usage/Get.php
index ec46f77581..b61b137213 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Usage/Get.php
@@ -55,7 +55,7 @@ class Get extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.getTableUsage',
+                    replaceWith: 'tablesdb.getTableUsage',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
index 1b2f3cab32..0c6bd5ca2e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
@@ -57,7 +57,7 @@ class XList extends Action
                 contentType: ContentType::JSON,
                 deprecated: new Deprecated(
                     since: '1.8.0',
-                    replaceWith: 'grids.listTables',
+                    replaceWith: 'tablesdb.listTables',
                 ),
             ))
             ->param('databaseId', '', new UID(), 'Database ID.')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Create.php
index b2f89f92f2..daae50cd58 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Create.php
@@ -60,14 +60,14 @@ class Create extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.createDatabase',
+                        replaceWith: 'tablesdb.createDatabase',
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
-                    group: 'grids',
+                    namespace: 'tablesdb',
+                    group: 'tablesdb',
                     name: 'createDatabase',
-                    description: '/docs/references/grids/create-database.md',
+                    description: '/docs/references/tablesdb/create-database.md',
                     auth: [AuthType::KEY],
                     responses: [
                         new SDKResponse(
@@ -81,7 +81,7 @@ class Create extends Action
             ->param('databaseId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
             ->param('name', '', new Text(128), 'Database name. Max length: 128 chars.')
             ->param('enabled', true, new Boolean(), 'Is the database enabled? When set to \'disabled\', users cannot access the database but Server SDKs with an API key can still read and write to the database. No data is lost when this is toggled.', true)
-            ->param('type', 'grids', new WhiteList(['grids','legacy']), 'Database type.', true)
+            ->param('type', 'tablesdb', new WhiteList(['tablesdb','legacy']), 'Database type.', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('queueForEvents')
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Delete.php
index 388b5edf7e..8b637539b8 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Delete.php
@@ -51,14 +51,14 @@ class Delete extends Action
                     contentType: ContentType::NONE,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.deleteDatabase',
+                        replaceWith: 'tablesdb.deleteDatabase',
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
-                    group: 'grids',
+                    namespace: 'tablesdb',
+                    group: 'tablesdb',
                     name: 'deleteDatabase',
-                    description: '/docs/references/grids/delete-database.md',
+                    description: '/docs/references/tablesdb/delete-database.md',
                     auth: [AuthType::KEY],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Get.php
index a3ac4d0da0..2e073a427d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Get.php
@@ -46,14 +46,14 @@ class Get extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.getDatabase',
+                        replaceWith: 'tablesdb.getDatabase',
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
-                    group: 'grids',
+                    namespace: 'tablesdb',
+                    group: 'tablesdb',
                     name: 'getDatabase',
-                    description: '/docs/references/grids/get-database.md',
+                    description: '/docs/references/tablesdb/get-database.md',
                     auth: [AuthType::KEY],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
index 5828b9f8b8..1abb57aab6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
@@ -58,14 +58,14 @@ class XList extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.listDatabaseLogs',
+                        replaceWith: 'tablesdb.listDatabaseLogs',
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
+                    namespace: 'tablesdb',
                     group: 'logs',
                     name: 'listDatabaseLogs',
-                    description: '/docs/references/grids/list-database-logs.md',
+                    description: '/docs/references/tablesdb/list-database-logs.md',
                     auth: [AuthType::ADMIN],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Update.php
index b2b268075c..c1732d11c8 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Update.php
@@ -52,14 +52,14 @@ class Update extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.updateDatabase',
+                        replaceWith: 'tablesdb.updateDatabase',
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
-                    group: 'grids',
+                    namespace: 'tablesdb',
+                    group: 'tablesdb',
                     name: 'updateDatabase',
-                    description: '/docs/references/grids/update-database.md',
+                    description: '/docs/references/tablesdb/update-database.md',
                     auth: [AuthType::KEY],
                     responses: [
                         new SDKResponse(
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 8efb6ae0ee..449ee4f04a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/Get.php
@@ -51,14 +51,14 @@ class Get extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.' . self::getName(),
+                        replaceWith: 'tablesdb.' . self::getName(),
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
+                    namespace: 'tablesdb',
                     group: null,
                     name: self::getName(),
-                    description: '/docs/references/grids/get-database-usage.md',
+                    description: '/docs/references/tablesdb/get-database-usage.md',
                     auth: [AuthType::ADMIN],
                     responses: [
                         new SDKResponse(
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 31d520611e..84d54077ea 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Usage/XList.php
@@ -49,14 +49,14 @@ class XList extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.listDatabaseUsage'
+                        replaceWith: 'tablesdb.listDatabaseUsage'
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
+                    namespace: 'tablesdb',
                     group: null,
                     name: 'listDatabaseUsage',
-                    description: '/docs/references/grids/list-database-usage.md',
+                    description: '/docs/references/tablesdb/list-database-usage.md',
                     auth: [AuthType::ADMIN],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/XList.php
index fdf3428101..120a2c9dfb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/XList.php
@@ -52,14 +52,14 @@ class XList extends Action
                     contentType: ContentType::JSON,
                     deprecated: new Deprecated(
                         since: '1.8.0',
-                        replaceWith: 'grids.listDatabases',
+                        replaceWith: 'tablesdb.listDatabases',
                     )
                 ),
                 new Method(
-                    namespace: 'grids',
-                    group: 'grids',
+                    namespace: 'tablesdb',
+                    group: 'tablesdb',
                     name: 'listDatabases',
-                    description: '/docs/references/grids/list-databases.md',
+                    description: '/docs/references/tablesdb/list-databases.md',
                     auth: [AuthType::KEY],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Create.php
new file mode 100644
index 0000000000..c256735803
--- /dev/null
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Create.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Create as DatabaseCreate;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\CustomId;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Text;
+use Utopia\Validator\WhiteList;
+
+class Create extends DatabaseCreate
+{
+    public static function getName(): string
+    {
+        return 'createTablesDatabase';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
+            ->setHttpPath('/v1/tablesdb')
+            ->desc('Create database')
+            ->groups(['api', 'database'])
+            ->label('event', 'databases.[databaseId].create')
+            ->label('scope', 'databases.write')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('audits.event', 'database.create')
+            ->label('audits.resource', 'database/{response.$id}')
+            ->label('sdk', new Method(
+                namespace: 'tablesdb',
+                group: 'tablesdb',
+                name: 'createDatabase',
+                description: '/docs/references/tablesdb/create-database.md',
+                auth: [AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_CREATED,
+                        model: UtopiaResponse::MODEL_DATABASE,
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->param('databaseId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
+            ->param('name', '', new Text(128), 'Database name. Max length: 128 chars.')
+            ->param('enabled', true, new Boolean(), 'Is the database enabled? When set to \'disabled\', users cannot access the database but Server SDKs with an API key can still read and write to the database. No data is lost when this is toggled.', true)
+            ->param('type', 'tablesdb', new WhiteList(['tablesdb','legacy']), 'Database type.', true)
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForEvents')
+            ->callback($this->action(...));
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Delete.php
new file mode 100644
index 0000000000..e3e7d61885
--- /dev/null
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Delete.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Delete as DatabaseDelete;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Validator\UID;
+use Utopia\Swoole\Response as SwooleResponse;
+
+class Delete extends DatabaseDelete
+{
+    public static function getName(): string
+    {
+        return 'deleteTablesDatabase';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_DELETE)
+            ->setHttpPath('/v1/tablesdb/:databaseId')
+            ->desc('Delete database')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', 'databases.write')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].delete')
+            ->label('audits.event', 'database.delete')
+            ->label('audits.resource', 'database/{request.databaseId}')
+            ->label('sdk', new Method(
+                namespace: 'tablesdb',
+                group: 'tablesdb',
+                name: 'deleteDatabase',
+                description: '/docs/references/tablesdb/delete-database.md',
+                auth: [AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_NOCONTENT,
+                        model: UtopiaResponse::MODEL_NONE,
+                    )
+                ],
+                contentType: ContentType::NONE
+            ))
+            ->param('databaseId', '', new UID(), 'Database ID.')
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForDatabase')
+            ->inject('queueForEvents')
+            ->inject('queueForStatsUsage')
+            ->callback($this->action(...));
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Get.php
new file mode 100644
index 0000000000..aad0cf1f2b
--- /dev/null
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Get.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Get as DatabaseGet;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Validator\UID;
+use Utopia\Swoole\Response as SwooleResponse;
+
+class Get extends DatabaseGet
+{
+    public static function getName(): string
+    {
+        return 'getTablesDatabase';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/tablesdb/:databaseId')
+            ->desc('Get database')
+            ->groups(['api', 'database'])
+            ->label('scope', 'databases.read')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('sdk', new Method(
+                namespace: 'tablesdb',
+                group: 'tablesdb',
+                name: 'getDatabase',
+                description: '/docs/references/tablesdb/get-database.md',
+                auth: [AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_OK,
+                        model: UtopiaResponse::MODEL_DATABASE,
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->param('databaseId', '', new UID(), 'Database ID.')
+            ->inject('response')
+            ->inject('dbForProject')
+            ->callback($this->action(...));
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Update.php
new file mode 100644
index 0000000000..40104e9db3
--- /dev/null
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/Update.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\Update as DatabaseUpdate;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Database\Validator\UID;
+use Utopia\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Text;
+
+class Update extends DatabaseUpdate
+{
+    public static function getName(): string
+    {
+        return 'updateTablesDatabase';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_PUT)
+            ->setHttpPath('/v1/tablesdb/:databaseId')
+            ->desc('Update database')
+            ->groups(['api', 'database', 'schema'])
+            ->label('scope', 'databases.write')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('event', 'databases.[databaseId].update')
+            ->label('audits.event', 'database.update')
+            ->label('audits.resource', 'database/{response.$id}')
+            ->label('sdk', new Method(
+                namespace: 'tablesdb',
+                group: 'tablesdb',
+                name: 'updateDatabase',
+                description: '/docs/references/tablesdb/update-database.md',
+                auth: [AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_OK,
+                        model: UtopiaResponse::MODEL_DATABASE,
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->param('databaseId', '', new UID(), 'Database ID.')
+            ->param('name', null, new Text(128), 'Database name. Max length: 128 chars.')
+            ->param('enabled', true, new Boolean(), 'Is database enabled? When set to \'disabled\', users cannot access the database but Server SDKs with an API key can still read and write to the database. No data is lost when this is toggled.', true)
+            ->inject('response')
+            ->inject('dbForProject')
+            ->inject('queueForEvents')
+            ->callback($this->action(...));
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/XList.php
new file mode 100644
index 0000000000..0f9c239250
--- /dev/null
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Databases/XList.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases;
+
+use Appwrite\Platform\Modules\Databases\Http\Databases\XList as DatabaseXList;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
+use Appwrite\SDK\Method;
+use Appwrite\SDK\Response as SDKResponse;
+use Appwrite\Utopia\Database\Validator\Queries\Databases;
+use Appwrite\Utopia\Response as UtopiaResponse;
+use Utopia\Swoole\Response as SwooleResponse;
+use Utopia\Validator\Text;
+
+class XList extends DatabaseXList
+{
+    public static function getName(): string
+    {
+        return 'listTablesDatabases';
+    }
+
+    public function __construct()
+    {
+        $this
+            ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
+            ->setHttpPath('/v1/tablesdb')
+            ->desc('List databases')
+            ->groups(['api', 'database'])
+            ->label('scope', 'databases.read')
+            ->label('resourceType', RESOURCE_TYPE_DATABASES)
+            ->label('sdk', new Method(
+                namespace: 'tablesdb',
+                group: 'tablesdb',
+                name: 'listDatabases',
+                description: '/docs/references/tablesdb/list-databases.md',
+                auth: [AuthType::KEY],
+                responses: [
+                    new SDKResponse(
+                        code: SwooleResponse::STATUS_CODE_OK,
+                        model: UtopiaResponse::MODEL_DATABASE_LIST,
+                    )
+                ],
+                contentType: ContentType::JSON
+            ))
+            ->param('queries', [], new Databases(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Databases::ALLOWED_ATTRIBUTES), true)
+            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
+            ->inject('response')
+            ->inject('dbForProject')
+            ->callback($this->action(...));
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Boolean/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Boolean/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php
index a28b52aef0..adb62f532e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Boolean/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Boolean;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Boolean;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean\Create as BooleanCreate;
 use Appwrite\SDK\AuthType;
@@ -28,19 +28,19 @@ class Create extends BooleanCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/boolean')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/boolean')
             ->desc('Create boolean column')
             ->groups(['api', 'database', 'schema'])
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-boolean-column.md',
+                description: '/docs/references/tablesdb/create-boolean-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Boolean/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Boolean/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php
index c2f40c96fb..9863d9b7b7 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Boolean/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Boolean;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Boolean;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Boolean\Update as BooleanUpdate;
 use Appwrite\SDK\AuthType;
@@ -30,19 +30,19 @@ class Update extends BooleanUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/boolean/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/boolean/:key')
             ->desc('Update boolean column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-boolean-column.md',
+                description: '/docs/references/tablesdb/update-boolean-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Datetime/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Datetime/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php
index f1214f707b..e060e04d7d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Datetime/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Datetime;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Datetime;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime\Create as DatetimeCreate;
 use Appwrite\SDK\AuthType;
@@ -30,19 +30,19 @@ class Create extends DatetimeCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/datetime')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/datetime')
             ->desc('Create datetime column')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-datetime-column.md',
+                description: '/docs/references/tablesdb/create-datetime-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Datetime/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Datetime/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php
index f2f5001242..bfba375443 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Datetime/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Datetime;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Datetime;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Datetime\Update as DatetimeUpdate;
 use Appwrite\SDK\AuthType;
@@ -32,19 +32,19 @@ class Update extends DatetimeUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/datetime/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/datetime/:key')
             ->desc('Update dateTime column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-datetime-column.md',
+                description: '/docs/references/tablesdb/update-datetime-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php
similarity index 88%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php
index 9af55bee70..555af833df 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Delete as AttributesDelete;
 use Appwrite\SDK\AuthType;
@@ -29,19 +29,19 @@ class Delete extends AttributesDelete
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key')
             ->desc('Delete column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.delete')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/delete-column.md',
+                description: '/docs/references/tablesdb/delete-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Email/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Email/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php
index 3fd8d88fb5..b2d09d4511 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Email/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Email;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Email;
 
 use Appwrite\Network\Validator\Email;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Email\Create as EmailCreate;
@@ -29,19 +29,19 @@ class Create extends EmailCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/email')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/email')
             ->desc('Create email column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-email-column.md',
+                description: '/docs/references/tablesdb/create-email-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Email/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Email/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php
index 180ce40b6d..15f85eef81 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Email/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Email;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Email;
 
 use Appwrite\Network\Validator\Email;
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Email\Update as EmailUpdate;
@@ -31,19 +31,19 @@ class Update extends EmailUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/email/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/email/:key')
             ->desc('Update email column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-email-column.md',
+                description: '/docs/references/tablesdb/update-email-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Enum/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php
similarity index 90%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Enum/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php
index c3ccffec1e..52972deadf 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Enum/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Enum;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Enum;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Enum\Create as EnumCreate;
 use Appwrite\SDK\AuthType;
@@ -31,19 +31,19 @@ class Create extends EnumCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/enum')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/enum')
             ->desc('Create enum column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-enum-column.md',
+                description: '/docs/references/tablesdb/create-enum-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Enum/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php
similarity index 90%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Enum/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php
index 32f77a488a..cd9c111812 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Enum/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Enum;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Enum;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Enum\Update as EnumUpdate;
 use Appwrite\SDK\AuthType;
@@ -33,19 +33,19 @@ class Update extends EnumUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/enum/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/enum/:key')
             ->desc('Update enum column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-enum-column.md',
+                description: '/docs/references/tablesdb/update-enum-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Float/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Float/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php
index 42699ca45e..0a60796679 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Float/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Float;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Float;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Float\Create as FloatCreate;
 use Appwrite\SDK\AuthType;
@@ -29,19 +29,19 @@ class Create extends FloatCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/float')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/float')
             ->desc('Create float column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-float-column.md',
+                description: '/docs/references/tablesdb/create-float-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Float/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Float/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php
index cd801450c7..d4f8328e30 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Float/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Float;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Float;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Float\Update as FloatUpdate;
 use Appwrite\SDK\AuthType;
@@ -31,19 +31,19 @@ class Update extends FloatUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/float/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/float/:key')
             ->desc('Update float column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-float-column.md',
+                description: '/docs/references/tablesdb/update-float-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php
similarity index 90%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php
index 295a4ff530..8debcb11f3 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Get as AttributesGet;
 use Appwrite\SDK\AuthType;
@@ -38,7 +38,7 @@ class Get extends AttributesGet
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key')
             ->desc('Get column')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.read')
@@ -47,7 +47,7 @@ class Get extends AttributesGet
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/get-column.md',
+                description: '/docs/references/tablesdb/get-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/IP/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/IP/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php
index 541214897e..eca17b037d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/IP/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\IP;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\IP;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\IP\Create as IPCreate;
 use Appwrite\SDK\AuthType;
@@ -29,19 +29,19 @@ class Create extends IPCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/ip')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/ip')
             ->desc('Create IP address column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-ip-column.md',
+                description: '/docs/references/tablesdb/create-ip-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/IP/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/IP/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php
index c52105c812..501de3659a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/IP/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\IP;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\IP;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\IP\Update as IPUpdate;
 use Appwrite\SDK\AuthType;
@@ -31,19 +31,19 @@ class Update extends IPUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/ip/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/ip/:key')
             ->desc('Update IP address column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-ip-column.md',
+                description: '/docs/references/tablesdb/update-ip-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Integer/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Integer/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php
index 9873ad83b1..0201ebda87 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Integer/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Integer;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Integer;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Integer\Create as IntegerCreate;
 use Appwrite\SDK\AuthType;
@@ -29,19 +29,19 @@ class Create extends IntegerCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/integer')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/integer')
             ->desc('Create integer column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-integer-column.md',
+                description: '/docs/references/tablesdb/create-integer-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Integer/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Integer/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php
index e70f8bf7b0..0667069a39 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Integer/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Integer;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Integer;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Integer\Update as IntegerUpdate;
 use Appwrite\SDK\AuthType;
@@ -31,19 +31,19 @@ class Update extends IntegerUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/integer/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/integer/:key')
             ->desc('Update integer column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-integer-column.md',
+                description: '/docs/references/tablesdb/update-integer-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Relationship/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php
similarity index 90%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Relationship/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php
index d6942a4d15..4b94ee2d21 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Relationship/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Relationship;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Relationship;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Relationship\Create as RelationshipCreate;
 use Appwrite\SDK\AuthType;
@@ -30,19 +30,19 @@ class Create extends RelationshipCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/relationship')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/relationship')
             ->desc('Create relationship column')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-relationship-column.md',
+                description: '/docs/references/tablesdb/create-relationship-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Relationship/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php
similarity index 88%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Relationship/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php
index 729760bde0..47269fc329 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/Relationship/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Relationship;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Relationship;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\Relationship\Update as RelationshipUpdate;
 use Appwrite\SDK\AuthType;
@@ -30,19 +30,19 @@ class Update extends RelationshipUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/:key/relationship')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key/relationship')
             ->desc('Update relationship column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-relationship-column.md',
+                description: '/docs/references/tablesdb/update-relationship-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/String/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/String/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php
index 5829ce5361..52df9dc5e0 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/String/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\String;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\String;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\String\Create as StringCreate;
 use Appwrite\SDK\AuthType;
@@ -31,19 +31,19 @@ class Create extends StringCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/string')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/string')
             ->desc('Create string column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-string-column.md',
+                description: '/docs/references/tablesdb/create-string-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/String/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php
similarity index 90%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/String/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php
index 6333443686..bfad80e3b9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/String/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\String;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\String;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\String\Update as StringUpdate;
 use Appwrite\SDK\AuthType;
@@ -33,19 +33,19 @@ class Update extends StringUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/string/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/string/:key')
             ->desc('Update string column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-string-column.md',
+                description: '/docs/references/tablesdb/update-string-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/URL/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/URL/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php
index 429ef06dbd..ea2271b85a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/URL/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\URL;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\URL;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\URL\Create as URLCreate;
 use Appwrite\SDK\AuthType;
@@ -29,19 +29,19 @@ class Create extends URLCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/url')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/url')
             ->desc('Create URL column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/create-url-column.md',
+                description: '/docs/references/tablesdb/create-url-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/URL/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/URL/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php
index de4b4ab79b..565cc91680 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/URL/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\URL;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\URL;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\URL\Update as URLUpdate;
 use Appwrite\SDK\AuthType;
@@ -31,19 +31,19 @@ class Update extends URLUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns/url/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/url/:key')
             ->desc('Update URL column')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-url-column.md',
+                description: '/docs/references/tablesdb/update-url-column.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php
index d8b6e39ac6..1bf8f08438 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Columns/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Attributes\XList as AttributesXList;
 use Appwrite\SDK\AuthType;
@@ -27,7 +27,7 @@ class XList extends AttributesXList
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/columns')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns')
             ->desc('List columns')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.read')
@@ -36,7 +36,7 @@ class XList extends AttributesXList
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/list-columns.md',
+                description: '/docs/references/tablesdb/list-columns.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php
similarity index 92%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php
index f4274079bc..d3216d4dd4 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Create as CollectionCreate;
 use Appwrite\SDK\AuthType;
@@ -31,19 +31,19 @@ class Create extends CollectionCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables')
             ->desc('Create table')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].create')
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'table.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{response.$id}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{response.$id}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: null,
                 name: self::getName(),
-                description: '/docs/references/grids/create-table.md',
+                description: '/docs/references/tablesdb/create-table.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php
similarity index 88%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php
index 13c3a7196b..51779d71c7 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Delete as CollectionDelete;
 use Appwrite\SDK\AuthType;
@@ -27,19 +27,19 @@ class Delete extends CollectionDelete
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId')
             ->desc('Delete table')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].delete')
             ->label('audits.event', 'table.delete')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: null,
                 name: self::getName(),
-                description: '/docs/references/grids/delete-table.md',
+                description: '/docs/references/tablesdb/delete-table.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php
similarity index 88%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php
index 3ac36d27ca..d14a15da51 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Get as CollectionGet;
 use Appwrite\SDK\AuthType;
@@ -27,7 +27,7 @@ class Get extends CollectionGet
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId')
             ->desc('Get table')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.read')
@@ -36,7 +36,7 @@ class Get extends CollectionGet
                 namespace: $this->getSdkNamespace(),
                 group: null,
                 name: self::getName(),
-                description: '/docs/references/grids/get-table.md',
+                description: '/docs/references/tablesdb/get-table.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php
similarity index 92%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php
index 9bb3d6f123..6d35355981 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Indexes\Create as IndexCreate;
 use Appwrite\SDK\AuthType;
@@ -33,19 +33,19 @@ class Create extends IndexCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/indexes')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes')
             ->desc('Create index')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].indexes.[indexId].create')
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'index.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: 'createIndex', // getName needs to be different from parent action to avoid conflict in path name
-                description: '/docs/references/grids/create-index.md',
+                description: '/docs/references/tablesdb/create-index.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php
index 679de9b77c..bad49b251f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Indexes\Delete as IndexDelete;
 use Appwrite\SDK\AuthType;
@@ -32,19 +32,19 @@ class Delete extends IndexDelete
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/indexes/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes/:key')
             ->desc('Delete index')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].indexes.[indexId].update')
             ->label('audits.event', 'index.delete')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: 'deleteIndex', // getName needs to be different from parent action to avoid conflict in path name
-                description: '/docs/references/grids/delete-index.md',
+                description: '/docs/references/tablesdb/delete-index.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php
index f2c7cbcb94..7a40f8c6ea 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Indexes\Get as IndexGet;
 use Appwrite\SDK\AuthType;
@@ -28,7 +28,7 @@ class Get extends IndexGet
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/indexes/:key')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes/:key')
             ->desc('Get index')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.read')
@@ -37,7 +37,7 @@ class Get extends IndexGet
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: 'getIndex', // getName needs to be different from parent action to avoid conflict in path name
-                description: '/docs/references/grids/get-index.md',
+                description: '/docs/references/tablesdb/get-index.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php
index 4ec7da0a41..156f6eb0c6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Indexes/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Indexes\XList as IndexXList;
 use Appwrite\SDK\AuthType;
@@ -28,7 +28,7 @@ class XList extends IndexXList
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/indexes')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes')
             ->desc('List indexes')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.read')
@@ -37,7 +37,7 @@ class XList extends IndexXList
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: 'listIndexes', // getName needs to be different from parent action to avoid conflict in path name
-                description: '/docs/references/grids/list-indexes.md',
+                description: '/docs/references/tablesdb/list-indexes.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Logs/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php
index 1c24a23175..a659f1b23b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Logs;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Logs;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Logs\XList as CollectionLogXList;
 use Appwrite\SDK\AuthType;
@@ -24,7 +24,7 @@ class XList extends CollectionLogXList
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/logs')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/logs')
             ->desc('List table logs')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.read')
@@ -33,7 +33,7 @@ class XList extends CollectionLogXList
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/get-table-logs.md',
+                description: '/docs/references/tablesdb/get-table-logs.md',
                 auth: [AuthType::ADMIN],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php
index 6816fc3b13..cb882eb682 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Bulk;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Bulk;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Bulk\Delete as DocumentsDelete;
 use Appwrite\SDK\AuthType;
@@ -29,13 +29,13 @@ class Delete extends DocumentsDelete
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Delete rows')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.delete')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -43,7 +43,7 @@ class Delete extends DocumentsDelete
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/delete-rows.md',
+                description: '/docs/references/tablesdb/delete-rows.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php
index 8c640f00f8..bc9d4ee0aa 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Bulk;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Bulk;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Bulk\Update as DocumentsUpdate;
 use Appwrite\SDK\AuthType;
@@ -30,13 +30,13 @@ class Update extends DocumentsUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Update rows')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -44,7 +44,7 @@ class Update extends DocumentsUpdate
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-rows.md',
+                description: '/docs/references/tablesdb/update-rows.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php
similarity index 90%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Upsert.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php
index 35f0a99bdc..ca0511c9c2 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Bulk/Upsert.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Bulk;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Bulk;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Bulk\Upsert as DocumentsUpsert;
 use Appwrite\SDK\AuthType;
@@ -29,13 +29,13 @@ class Upsert extends DocumentsUpsert
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PUT)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Create or update rows')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -44,7 +44,7 @@ class Upsert extends DocumentsUpsert
                     namespace: $this->getSdkNamespace(),
                     group: $this->getSdkGroup(),
                     name: self::getName(),
-                    description: '/docs/references/grids/upsert-rows.md',
+                    description: '/docs/references/tablesdb/upsert-rows.md',
                     auth: [AuthType::ADMIN, AuthType::KEY],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Decrement.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Decrement.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php
index fffd6db0fd..023f7efe77 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Decrement.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Column;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Column;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Attribute\Decrement as DecrementDocumentAttribute;
 use Appwrite\SDK\AuthType;
@@ -29,14 +29,14 @@ class Decrement extends DecrementDocumentAttribute
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId/:column/decrement')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId/:column/decrement')
             ->desc('Decrement row column')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -44,7 +44,7 @@ class Decrement extends DecrementDocumentAttribute
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/decrement-row-column.md',
+                description: '/docs/references/tablesdb/decrement-row-column.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Increment.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Increment.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php
index 67cbd81367..092fb1c43f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Column/Increment.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Column;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Column;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Attribute\Increment as IncrementDocumentAttribute;
 use Appwrite\SDK\AuthType;
@@ -29,14 +29,14 @@ class Increment extends IncrementDocumentAttribute
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId/:column/increment')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId/:column/increment')
             ->desc('Increment row column')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -44,7 +44,7 @@ class Increment extends IncrementDocumentAttribute
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/increment-row-column.md',
+                description: '/docs/references/tablesdb/increment-row-column.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php
similarity index 93%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Create.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php
index a9101e0265..a3968b524f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Create as DocumentCreate;
 use Appwrite\SDK\AuthType;
@@ -38,13 +38,13 @@ class Create extends DocumentCreate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Create row')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.create')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -54,7 +54,7 @@ class Create extends DocumentCreate
                     group: $this->getSdkGroup(),
                     name: self::getName(),
                     desc: 'Create row',
-                    description: '/docs/references/grids/create-row.md',
+                    description: '/docs/references/tablesdb/create-row.md',
                     auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
                     responses: [
                         new SDKResponse(
@@ -76,7 +76,7 @@ class Create extends DocumentCreate
                     group: $this->getSdkGroup(),
                     name: $this->getBulkActionName(self::getName()),
                     desc: 'Create rows',
-                    description: '/docs/references/grids/create-rows.md',
+                    description: '/docs/references/tablesdb/create-rows.md',
                     auth: [AuthType::ADMIN, AuthType::KEY],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php
similarity index 90%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Delete.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php
index f821aabe6e..4f051e05f1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Delete as DocumentDelete;
 use Appwrite\SDK\AuthType;
@@ -33,14 +33,14 @@ class Delete extends DocumentDelete
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId')
             ->desc('Delete row')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].delete')
             ->label('audits.event', 'row.delete')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}/row/{request.rowId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}/row/{request.rowId}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -48,7 +48,7 @@ class Delete extends DocumentDelete
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/delete-row.md',
+                description: '/docs/references/tablesdb/delete-row.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php
index 1015e01819..a863f59ea4 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Get as DocumentGet;
 use Appwrite\SDK\AuthType;
@@ -29,7 +29,7 @@ class Get extends DocumentGet
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId')
             ->desc('Get row')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.read')
@@ -38,7 +38,7 @@ class Get extends DocumentGet
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/get-row.md',
+                description: '/docs/references/tablesdb/get-row.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php
similarity index 89%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Logs/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php
index 4522b3005f..24b664d812 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Logs;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Logs;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Logs\XList as DocumentLogXList;
 use Appwrite\SDK\AuthType;
@@ -24,7 +24,7 @@ class XList extends DocumentLogXList
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId/logs')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId/logs')
             ->desc('List row logs')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.read')
@@ -33,7 +33,7 @@ class XList extends DocumentLogXList
                 namespace: $this->getSdkNamespace(),
                 group: 'logs',
                 name: self::getName(),
-                description: '/docs/references/grids/get-row-logs.md',
+                description: '/docs/references/tablesdb/get-row-logs.md',
                 auth: [AuthType::ADMIN],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php
index 7731e10e9d..a38ae37b58 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Update as DocumentUpdate;
 use Appwrite\SDK\AuthType;
@@ -30,14 +30,14 @@ class Update extends DocumentUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId')
             ->desc('Update row')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}/row/{response.$id}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}/row/{response.$id}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -45,7 +45,7 @@ class Update extends DocumentUpdate
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/update-row.md',
+                description: '/docs/references/tablesdb/update-row.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Upsert.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php
index d9756eab87..234e504916 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/Upsert.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\Upsert as DocumentUpsert;
 use Appwrite\SDK\AuthType;
@@ -30,14 +30,14 @@ class Upsert extends DocumentUpsert
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PUT)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows/:rowId')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId')
             ->desc('Create or update a row')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].upsert')
             ->label('scope', 'rows.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.upsert')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}/row/{response.$id}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}/row/{response.$id}')
             ->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
@@ -46,7 +46,7 @@ class Upsert extends DocumentUpsert
                     namespace: $this->getSdkNamespace(),
                     group: $this->getSdkGroup(),
                     name: self::getName(),
-                    description: '/docs/references/grids/upsert-row.md',
+                    description: '/docs/references/tablesdb/upsert-row.md',
                     auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
                     responses: [
                         new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php
index d2589e4b63..9b5c4da77c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Rows/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Documents\XList as DocumentXList;
 use Appwrite\SDK\AuthType;
@@ -29,7 +29,7 @@ class XList extends DocumentXList
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/rows')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('List rows')
             ->groups(['api', 'database'])
             ->label('scope', 'rows.read')
@@ -38,7 +38,7 @@ class XList extends DocumentXList
                 namespace: $this->getSdkNamespace(),
                 group: $this->getSdkGroup(),
                 name: self::getName(),
-                description: '/docs/references/grids/list-rows.md',
+                description: '/docs/references/tablesdb/list-rows.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Update.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php
index b4e8df6e57..22adc17dc8 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Update as CollectionUpdate;
 use Appwrite\SDK\AuthType;
@@ -30,19 +30,19 @@ class Update extends CollectionUpdate
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_PUT)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId')
             ->desc('Update table')
             ->groups(['api', 'database', 'schema'])
             ->label('scope', 'tables.write')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].update')
             ->label('audits.event', 'table.update')
-            ->label('audits.resource', 'database/{request.databaseId}/grid/table/{request.tableId}')
+            ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),
                 group: null,
                 name: self::getName(),
-                description: '/docs/references/grids/update-table.md',
+                description: '/docs/references/tablesdb/update-table.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Usage/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php
similarity index 88%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Usage/Get.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php
index 015c2c2592..0cda3770f9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Usage;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Usage;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\Usage\Get as CollectionUsageGet;
 use Appwrite\SDK\AuthType;
@@ -28,7 +28,7 @@ class Get extends CollectionUsageGet
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables/:tableId/usage')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/usage')
             ->desc('Get table usage stats')
             ->groups(['api', 'database', 'usage'])
             ->label('scope', 'tables.read')
@@ -37,7 +37,7 @@ class Get extends CollectionUsageGet
                 namespace: $this->getSdkNamespace(),
                 group: null,
                 name: self::getName(),
-                description: '/docs/references/grids/get-table-usage.md',
+                description: '/docs/references/tablesdb/get-table-usage.md',
                 auth: [AuthType::ADMIN],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php
similarity index 91%
rename from src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/XList.php
rename to src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php
index fd329ea6aa..9f68c073a2 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Grids/Tables/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Appwrite\Platform\Modules\Databases\Http\Grids\Tables;
+namespace Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables;
 
 use Appwrite\Platform\Modules\Databases\Http\Databases\Collections\XList as CollectionXList;
 use Appwrite\SDK\AuthType;
@@ -29,7 +29,7 @@ class XList extends CollectionXList
     {
         $this
             ->setHttpMethod(self::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/databases/:databaseId/grids/tables')
+            ->setHttpPath('/v1/tablesdb/:databaseId/tables')
             ->desc('List tables')
             ->groups(['api', 'database'])
             ->label('scope', 'tables.read')
@@ -38,7 +38,7 @@ class XList extends CollectionXList
                 namespace: $this->getSdkNamespace(),
                 group: null,
                 name: self::getName(),
-                description: '/docs/references/grids/list-tables.md',
+                description: '/docs/references/tablesdb/list-tables.md',
                 auth: [AuthType::KEY],
                 responses: [
                     new SDKResponse(
diff --git a/src/Appwrite/Platform/Modules/Databases/Services/Registry/Tables.php b/src/Appwrite/Platform/Modules/Databases/Services/Registry/Tables.php
index aad8571553..3702d39600 100644
--- a/src/Appwrite/Platform/Modules/Databases/Services/Registry/Tables.php
+++ b/src/Appwrite/Platform/Modules/Databases/Services/Registry/Tables.php
@@ -2,52 +2,57 @@
 
 namespace Appwrite\Platform\Modules\Databases\Services\Registry;
 
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Boolean\Create as CreateBoolean;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Boolean\Update as UpdateBoolean;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Datetime\Create as CreateDatetime;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Datetime\Update as UpdateDatetime;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Delete as DeleteColumn;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Email\Create as CreateEmail;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Email\Update as UpdateEmail;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Enum\Create as CreateEnum;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Enum\Update as UpdateEnum;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Float\Create as CreateFloat;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Float\Update as UpdateFloat;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Get as GetColumn;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Integer\Create as CreateInteger;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Integer\Update as UpdateInteger;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\IP\Create as CreateIP;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\IP\Update as UpdateIP;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Relationship\Create as CreateRelationship;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\Relationship\Update as UpdateRelationship;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\String\Create as CreateString;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\String\Update as UpdateString;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\URL\Create as CreateURL;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\URL\Update as UpdateURL;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Columns\XList as ListColumns;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Create as CreateTable;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Delete as DeleteTable;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Get as GetTable;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes\Create as CreateColumnIndex;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes\Delete as DeleteColumnIndex;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes\Get as GetColumnIndex;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Indexes\XList as ListColumnIndexes;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Logs\XList as ListTableLogs;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Bulk\Delete as DeleteRows;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Bulk\Update as UpdateRows;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Bulk\Upsert as UpsertRows;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Column\Decrement as DecrementRowColumn;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Column\Increment as IncrementRowColumn;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Create as CreateRow;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Delete as DeleteRow;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Get as GetRow;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Logs\XList as ListRowLogs;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Update as UpdateRow;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\Upsert as UpsertRow;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Rows\XList as ListRows;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Update as UpdateTable;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\Usage\Get as GetTableUsage;
-use Appwrite\Platform\Modules\Databases\Http\Grids\Tables\XList as ListTables;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases\Create as CreateTablesDatabase;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases\Delete as DeleteTablesDatabase;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases\Get as GetTablesDatabase;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases\Update as UpdateTablesDatabase;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Databases\XList as ListTablesDatabase;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Boolean\Create as CreateBoolean;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Boolean\Update as UpdateBoolean;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Datetime\Create as CreateDatetime;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Datetime\Update as UpdateDatetime;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Delete as DeleteColumn;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Email\Create as CreateEmail;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Email\Update as UpdateEmail;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Enum\Create as CreateEnum;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Enum\Update as UpdateEnum;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Float\Create as CreateFloat;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Float\Update as UpdateFloat;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Get as GetColumn;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Integer\Create as CreateInteger;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Integer\Update as UpdateInteger;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\IP\Create as CreateIP;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\IP\Update as UpdateIP;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Relationship\Create as CreateRelationship;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\Relationship\Update as UpdateRelationship;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\String\Create as CreateString;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\String\Update as UpdateString;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\URL\Create as CreateURL;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\URL\Update as UpdateURL;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Columns\XList as ListColumns;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Create as CreateTable;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Delete as DeleteTable;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Get as GetTable;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes\Create as CreateColumnIndex;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes\Delete as DeleteColumnIndex;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes\Get as GetColumnIndex;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Indexes\XList as ListColumnIndexes;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Logs\XList as ListTableLogs;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Bulk\Delete as DeleteRows;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Bulk\Update as UpdateRows;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Bulk\Upsert as UpsertRows;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Column\Decrement as DecrementRowColumn;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Column\Increment as IncrementRowColumn;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Create as CreateRow;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Delete as DeleteRow;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Get as GetRow;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Logs\XList as ListRowLogs;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Update as UpdateRow;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\Upsert as UpsertRow;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Rows\XList as ListRows;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Update as UpdateTable;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\Usage\Get as GetTableUsage;
+use Appwrite\Platform\Modules\Databases\Http\TablesDB\Tables\XList as ListTables;
 use Utopia\Platform\Service;
 
 /**
@@ -63,12 +68,22 @@ class Tables extends Base
 {
     protected function register(Service $service): void
     {
+        $this->registerDatabaseActions($service);
         $this->registerTableActions($service);
         $this->registerColumnActions($service);
         $this->registerIndexActions($service);
         $this->registerRowActions($service);
     }
 
+    private function registerDatabaseActions(Service $service): void
+    {
+        $service->addAction(CreateTablesDatabase::getName(), new CreateTablesDatabase());
+        $service->addAction(GetTablesDatabase::getName(), new GetTablesDatabase());
+        $service->addAction(UpdateTablesDatabase::getName(), new UpdateTablesDatabase());
+        $service->addAction(DeleteTablesDatabase::getName(), new DeleteTablesDatabase());
+        $service->addAction(ListTablesDatabase::getName(), new ListTablesDatabase());
+    }
+
     private function registerTableActions(Service $service): void
     {
         $service->addAction(CreateTable::getName(), new CreateTable());
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesBase.php b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
similarity index 90%
rename from tests/e2e/Services/Databases/Grids/DatabasesBase.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
index 2f300e7788..107f6390a3 100644
--- a/tests/e2e/Services/Databases/Grids/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
@@ -83,7 +83,7 @@ trait DatabasesBase
         /**
          * Test for SUCCESS
          */
-        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -99,7 +99,7 @@ trait DatabasesBase
         $this->assertEquals(201, $movies['headers']['status-code']);
         $this->assertEquals($movies['body']['name'], 'Movies');
 
-        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -135,7 +135,7 @@ trait DatabasesBase
 
         $response = $this->client->call(
             Client::METHOD_GET,
-            '/databases/console/grids/tables/' . $data['moviesId'] . '/rows',
+            '/databases/console/tablesdb/tables/' . $data['moviesId'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => 'console',
@@ -148,7 +148,7 @@ trait DatabasesBase
 
         $response = $this->client->call(
             Client::METHOD_GET,
-            '/databases/console/grids/tables/' . $data['moviesId'] . '/rows',
+            '/databases/console/tablesdb/tables/' . $data['moviesId'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 // 'x-appwrite-project' => '', empty header
@@ -167,7 +167,7 @@ trait DatabasesBase
         /**
          * Test for SUCCESS
          */
-        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'], array_merge([
+        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -181,7 +181,7 @@ trait DatabasesBase
         $this->assertFalse($response['body']['enabled']);
 
         if ($this->getSide() === 'client') {
-            $responseCreateDocument = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+            $responseCreateDocument = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()), [
@@ -198,14 +198,14 @@ trait DatabasesBase
 
             $this->assertEquals(404, $responseCreateDocument['headers']['status-code']);
 
-            $responseListDocument = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+            $responseListDocument = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
 
             $this->assertEquals(404, $responseListDocument['headers']['status-code']);
 
-            $responseGetDocument = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/someID', array_merge([
+            $responseGetDocument = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/someID', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -213,7 +213,7 @@ trait DatabasesBase
             $this->assertEquals(404, $responseGetDocument['headers']['status-code']);
         }
 
-        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'], array_merge([
+        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -234,7 +234,7 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
 
-        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/string', array_merge([
+        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -244,7 +244,7 @@ trait DatabasesBase
             'required' => true,
         ]);
 
-        $description = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/string', array_merge([
+        $description = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -255,7 +255,7 @@ trait DatabasesBase
             'default' => '',
         ]);
 
-        $tagline = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/string', array_merge([
+        $tagline = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -266,7 +266,7 @@ trait DatabasesBase
             'default' => '',
         ]);
 
-        $releaseYear = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/integer', array_merge([
+        $releaseYear = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -277,7 +277,7 @@ trait DatabasesBase
             'max' => 2200,
         ]);
 
-        $duration = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/integer', array_merge([
+        $duration = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -287,7 +287,7 @@ trait DatabasesBase
             'min' => 60,
         ]);
 
-        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/string', array_merge([
+        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -298,7 +298,7 @@ trait DatabasesBase
             'array' => true,
         ]);
 
-        $datetime = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/datetime', array_merge([
+        $datetime = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/datetime', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -307,7 +307,7 @@ trait DatabasesBase
             'required' => false,
         ]);
 
-        $relationship = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/relationship', array_merge([
+        $relationship = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -319,7 +319,7 @@ trait DatabasesBase
             'twoWayKey' => 'movie'
         ]);
 
-        $integers = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/integer', array_merge([
+        $integers = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -391,7 +391,7 @@ trait DatabasesBase
         // wait for database worker to create attributes
         sleep(2);
 
-        $movies = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'], array_merge([
+        $movies = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -418,7 +418,7 @@ trait DatabasesBase
     public function testListColumns(array $data): void
     {
         $databaseId = $data['databaseId'];
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -431,7 +431,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(2, \count($response['body']['columns']));
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -449,7 +449,7 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -465,7 +465,7 @@ trait DatabasesBase
         $this->assertEquals(201, $table['headers']['status-code']);
         $this->assertEquals($table['body']['name'], 'patch');
 
-        $attribute = $this->client->call(Client::METHOD_POST, '/databases/'.$databaseId.'/grids/tables/'.$table['body']['$id'].'/columns/string', array_merge([
+        $attribute = $this->client->call(Client::METHOD_POST, '/databases/'.$databaseId.'/tablesdb/tables/'.$table['body']['$id'].'/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -479,7 +479,7 @@ trait DatabasesBase
 
         sleep(1);
 
-        $index = $this->client->call(Client::METHOD_POST, '/databases/'.$databaseId.'/grids/tables/'.$table['body']['$id'].'/indexes', array_merge([
+        $index = $this->client->call(Client::METHOD_POST, '/databases/'.$databaseId.'/tablesdb/tables/'.$table['body']['$id'].'/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -495,7 +495,7 @@ trait DatabasesBase
         /**
          * Update attribute size to exceed Index maximum length
          */
-        $attribute = $this->client->call(Client::METHOD_PATCH, '/databases/'.$databaseId.'/grids/tables/'.$table['body']['$id'].'/columns/string/'.$attribute['body']['key'], array_merge([
+        $attribute = $this->client->call(Client::METHOD_PATCH, '/databases/'.$databaseId.'/tablesdb/tables/'.$table['body']['$id'].'/columns/string/'.$attribute['body']['key'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -520,7 +520,7 @@ trait DatabasesBase
             'name' => 'Test Database 2'
         ]);
 
-        $players = $this->client->call(Client::METHOD_POST, '/databases/' . $database['body']['$id'] . '/grids/tables', array_merge([
+        $players = $this->client->call(Client::METHOD_POST, '/databases/' . $database['body']['$id'] . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -534,7 +534,7 @@ trait DatabasesBase
         ]);
 
         // Create enum attribute
-        $attribute = $this->client->call(Client::METHOD_POST, '/databases/' . $database['body']['$id'] . '/grids/tables/' . $players['body']['$id'] . '/columns/enum', array_merge([
+        $attribute = $this->client->call(Client::METHOD_POST, '/databases/' . $database['body']['$id'] . '/tablesdb/tables/' . $players['body']['$id'] . '/columns/enum', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -552,7 +552,7 @@ trait DatabasesBase
         \sleep(2);
 
         // Update enum attribute
-        $attribute = $this->client->call(Client::METHOD_PATCH, '/databases/' . $database['body']['$id'] . '/grids/tables/' . $players['body']['$id'] . '/columns/enum/' . $attribute['body']['key'], array_merge([
+        $attribute = $this->client->call(Client::METHOD_PATCH, '/databases/' . $database['body']['$id'] . '/tablesdb/tables/' . $players['body']['$id'] . '/columns/enum/' . $attribute['body']['key'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -572,7 +572,7 @@ trait DatabasesBase
     public function testColumnResponseModels(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -588,7 +588,7 @@ trait DatabasesBase
 
         $tableId = $table['body']['$id'];
 
-        $columnsPath = "/databases/" . $databaseId . "/grids/tables/{$tableId}/columns";
+        $columnsPath = "/databases/" . $databaseId . "/tablesdb/tables/{$tableId}/columns";
 
         $string = $this->client->call(Client::METHOD_POST, $columnsPath . '/string', array_merge([
             'content-type' => 'application/json',
@@ -989,7 +989,7 @@ trait DatabasesBase
         $this->assertEquals($relationship['body']['twoWay'], $relationshipResponse['body']['twoWay']);
         $this->assertEquals($relationship['body']['twoWayKey'], $relationshipResponse['body']['twoWayKey']);
 
-        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns', array_merge([
+        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1101,7 +1101,7 @@ trait DatabasesBase
         $this->assertEquals($integersResponse['body']['min'], $columns[11]['min']);
         $this->assertEquals($integersResponse['body']['max'], $columns[11]['max']);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1216,7 +1216,7 @@ trait DatabasesBase
         /**
          * Test for FAILURE
          */
-        $badEnum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum', array_merge([
+        $badEnum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1240,7 +1240,7 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
 
-        $titleIndex = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $titleIndex = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1256,7 +1256,7 @@ trait DatabasesBase
         $this->assertCount(1, $titleIndex['body']['columns']);
         $this->assertEquals('title', $titleIndex['body']['columns'][0]);
 
-        $releaseYearIndex = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $releaseYearIndex = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1272,7 +1272,7 @@ trait DatabasesBase
         $this->assertCount(1, $releaseYearIndex['body']['columns']);
         $this->assertEquals('releaseYear', $releaseYearIndex['body']['columns'][0]);
 
-        $releaseWithDate1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $releaseWithDate1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1290,7 +1290,7 @@ trait DatabasesBase
         $this->assertEquals('$createdAt', $releaseWithDate1['body']['columns'][1]);
         $this->assertEquals('$updatedAt', $releaseWithDate1['body']['columns'][2]);
 
-        $releaseWithDate2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $releaseWithDate2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1307,7 +1307,7 @@ trait DatabasesBase
         $this->assertEquals('birthDay', $releaseWithDate2['body']['columns'][0]);
 
         // Test for failure
-        $fulltextReleaseYear = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $fulltextReleaseYear = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1320,7 +1320,7 @@ trait DatabasesBase
         $this->assertEquals(400, $fulltextReleaseYear['headers']['status-code']);
         $this->assertEquals($fulltextReleaseYear['body']['message'], 'Attribute "releaseYear" cannot be part of a FULLTEXT index, must be of type string');
 
-        $noAttributes = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $noAttributes = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1333,7 +1333,7 @@ trait DatabasesBase
         $this->assertEquals(400, $noAttributes['headers']['status-code']);
         $this->assertEquals($noAttributes['body']['message'], 'No attributes provided for index');
 
-        $duplicates = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $duplicates = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1346,7 +1346,7 @@ trait DatabasesBase
         $this->assertEquals(400, $duplicates['headers']['status-code']);
         $this->assertEquals($duplicates['body']['message'], 'Duplicate attributes provided');
 
-        $tooLong = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $tooLong = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1359,7 +1359,7 @@ trait DatabasesBase
         $this->assertEquals(400, $tooLong['headers']['status-code']);
         $this->assertStringContainsString('Index length is longer than the maximum', $tooLong['body']['message']);
 
-        $fulltextArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $fulltextArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1372,7 +1372,7 @@ trait DatabasesBase
         $this->assertEquals(400, $fulltextArray['headers']['status-code']);
         $this->assertEquals('"Fulltext" index is forbidden on array attributes', $fulltextArray['body']['message']);
 
-        $actorsArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $actorsArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1384,7 +1384,7 @@ trait DatabasesBase
 
         $this->assertEquals(202, $actorsArray['headers']['status-code']);
 
-        $twoLevelsArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $twoLevelsArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1397,7 +1397,7 @@ trait DatabasesBase
 
         $this->assertEquals(202, $twoLevelsArray['headers']['status-code']);
 
-        $unknown = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $unknown = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1410,7 +1410,7 @@ trait DatabasesBase
         $this->assertEquals(400, $unknown['headers']['status-code']);
         $this->assertEquals('Unknown column: Unknown. Verify the column name or create the column.', $unknown['body']['message']);
 
-        $index1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $index1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1423,7 +1423,7 @@ trait DatabasesBase
 
         $this->assertEquals(202, $index1['headers']['status-code']);
 
-        $index2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $index2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1440,7 +1440,7 @@ trait DatabasesBase
          */
         sleep(2);
 
-        $movies = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'], array_merge([
+        $movies = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1468,7 +1468,7 @@ trait DatabasesBase
         $tableId = $data['moviesId'];
 
         // Test case for valid lengths
-        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$tableId}/indexes", [
+        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$tableId}/indexes", [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1481,7 +1481,7 @@ trait DatabasesBase
         $this->assertEquals(202, $create['headers']['status-code']);
 
         // Fetch index and check correct lengths
-        $index = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/grids/tables/{$tableId}/indexes/lengthTestIndex", [
+        $index = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/tablesdb/tables/{$tableId}/indexes/lengthTestIndex", [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1491,7 +1491,7 @@ trait DatabasesBase
         $this->assertEquals([128, 200], $index['body']['lengths']);
 
         // Test case for count of lengths greater than attributes (should throw 400)
-        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$tableId}/indexes", [
+        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$tableId}/indexes", [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1504,7 +1504,7 @@ trait DatabasesBase
         $this->assertEquals(400, $create['headers']['status-code']);
 
         // Test case for lengths exceeding total of 768
-        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$tableId}/indexes", [
+        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$tableId}/indexes", [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1518,7 +1518,7 @@ trait DatabasesBase
         $this->assertEquals(400, $create['headers']['status-code']);
 
         // Test case for negative length values
-        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$tableId}/indexes", [
+        $create = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$tableId}/indexes", [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1537,7 +1537,7 @@ trait DatabasesBase
     public function testListIndexes(array $data): void
     {
         $databaseId = $data['databaseId'];
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1549,7 +1549,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(2, \count($response['body']['indexes']));
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1568,7 +1568,7 @@ trait DatabasesBase
     public function testCreateRow(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1589,7 +1589,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1612,7 +1612,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1635,7 +1635,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $row4 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row4 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1706,7 +1706,7 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
         $rowId = ID::unique();
-        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1723,14 +1723,14 @@ trait DatabasesBase
 
         $this->assertEquals(200, $row['headers']['status-code']);
         $this->assertCount(3, $row['body']['$permissions']);
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals('Thor: Ragnarok', $row['body']['title']);
 
-        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1748,7 +1748,7 @@ trait DatabasesBase
         $this->assertEquals(200, $row['headers']['status-code']);
         $this->assertEquals('Thor: Love and Thunder', $row['body']['title']);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1756,7 +1756,7 @@ trait DatabasesBase
         $this->assertEquals('Thor: Love and Thunder', $row['body']['title']);
 
         // removing permission to read and delete
-        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1769,7 +1769,7 @@ trait DatabasesBase
             ],
         ]);
         // shouldn't be able to read as no read permission
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1782,7 +1782,7 @@ trait DatabasesBase
                 break;
         }
         // shouldn't be able to delete as no delete permission
-        $row = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1792,7 +1792,7 @@ trait DatabasesBase
             $this->assertEquals(401, $row['headers']['status-code']);
         }
         // giving the delete permission
-        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1807,14 +1807,14 @@ trait DatabasesBase
             ],
         ]);
 
-        $row = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
         $this->assertEquals(204, $row['headers']['status-code']);
 
         // relationship behaviour
-        $person = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $person = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1832,7 +1832,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $person['headers']['status-code']);
 
-        $library = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $library = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1850,7 +1850,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $library['headers']['status-code']);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1862,7 +1862,7 @@ trait DatabasesBase
 
         sleep(1); // Wait for worker
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1876,7 +1876,7 @@ trait DatabasesBase
 
         sleep(1); // Wait for worker
 
-        $libraryName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $library['body']['$id'] . '/columns/string', array_merge([
+        $libraryName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $library['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1892,7 +1892,7 @@ trait DatabasesBase
 
         // upserting values
         $rowId = ID::unique();
-        $person1 = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows/'.$rowId, array_merge([
+        $person1 = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows/'.$rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1915,7 +1915,7 @@ trait DatabasesBase
         ]);
 
         $this->assertEquals('Library 1', $person1['body']['library']['libraryName']);
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1929,7 +1929,7 @@ trait DatabasesBase
         $this->assertEquals('Library 1', $rows['body']['rows'][0]['library']['libraryName']);
 
 
-        $person1 = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows/'.$rowId, array_merge([
+        $person1 = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows/'.$rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1953,7 +1953,7 @@ trait DatabasesBase
 
         // data should get updated
         $this->assertEquals('Library 2', $person1['body']['library']['libraryName']);
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1967,7 +1967,7 @@ trait DatabasesBase
         $this->assertEquals('Library 2', $rows['body']['rows'][0]['library']['libraryName']);
 
         // data should get added
-        $person1 = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows/'.ID::unique(), array_merge([
+        $person1 = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows/'.ID::unique(), array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1991,7 +1991,7 @@ trait DatabasesBase
 
         $this->assertEquals('Library 2', $person1['body']['library']['libraryName']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2003,7 +2003,7 @@ trait DatabasesBase
         $this->assertEquals(2, $rows['body']['total']);
 
         // test without passing permissions
-        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2016,7 +2016,7 @@ trait DatabasesBase
         $this->assertEquals(200, $row['headers']['status-code']);
         $this->assertEquals('Thor: Ragnarok', $row['body']['title']);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2024,7 +2024,7 @@ trait DatabasesBase
 
         $this->assertEquals(200, $row['headers']['status-code']);
 
-        $deleteResponse = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
+        $deleteResponse = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2193,7 +2193,7 @@ trait DatabasesBase
     public function testListRows(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2217,7 +2217,7 @@ trait DatabasesBase
             $this->assertEquals($data['moviesId'], $row['$tableId']);
         }
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2233,7 +2233,7 @@ trait DatabasesBase
         $this->assertCount(3, $rows['body']['rows']);
 
         // changing description attribute to be null by default instead of empty string
-        $patchNull = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/columns/string/description', array_merge([
+        $patchNull = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/columns/string/description', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2243,7 +2243,7 @@ trait DatabasesBase
         ]);
 
         // creating a dummy doc with null description
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2260,7 +2260,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row1['headers']['status-code']);
         // fetching docs with cursor after the dummy doc with order attr description which is null
-        $rowsPaginated = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rowsPaginated = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2273,7 +2273,7 @@ trait DatabasesBase
         $this->assertEquals(400, $rowsPaginated['headers']['status-code']);
 
         // deleting the dummy doc created
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $row1['body']['$id'], array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $row1['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2287,7 +2287,7 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
         foreach ($data['rows'] as $row) {
-            $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $row['$tableId'] . '/rows/' . $row['$id'], array_merge([
+            $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $row['$tableId'] . '/rows/' . $row['$id'], array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -2314,7 +2314,7 @@ trait DatabasesBase
         $databaseId = $data['databaseId'];
         $row = $data['rows'][0];
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $row['$tableId'] . '/rows/' . $row['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $row['$tableId'] . '/rows/' . $row['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2338,7 +2338,7 @@ trait DatabasesBase
         /**
          * Test after without order.
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2349,7 +2349,7 @@ trait DatabasesBase
         $this->assertEquals('Spider-Man: Homecoming', $base['body']['rows'][2]['title']);
         $this->assertCount(3, $base['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2363,7 +2363,7 @@ trait DatabasesBase
         $this->assertEquals($base['body']['rows'][2]['$id'], $rows['body']['rows'][1]['$id']);
         $this->assertCount(2, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2378,7 +2378,7 @@ trait DatabasesBase
         /**
          * Test with ASC order and after.
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2393,7 +2393,7 @@ trait DatabasesBase
         $this->assertEquals(2019, $base['body']['rows'][2]['releaseYear']);
         $this->assertCount(3, $base['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2410,7 +2410,7 @@ trait DatabasesBase
         /**
          * Test with DESC order and after.
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2425,7 +2425,7 @@ trait DatabasesBase
         $this->assertEquals(2019, $base['body']['rows'][0]['releaseYear']);
         $this->assertCount(3, $base['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2442,7 +2442,7 @@ trait DatabasesBase
         /**
          * Test after with unknown row.
          */
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2457,7 +2457,7 @@ trait DatabasesBase
          * Test null value for cursor
          */
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2480,7 +2480,7 @@ trait DatabasesBase
         /**
          * Test before without order.
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2491,7 +2491,7 @@ trait DatabasesBase
         $this->assertEquals('Spider-Man: Homecoming', $base['body']['rows'][2]['title']);
         $this->assertCount(3, $base['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2505,7 +2505,7 @@ trait DatabasesBase
         $this->assertEquals($base['body']['rows'][1]['$id'], $rows['body']['rows'][1]['$id']);
         $this->assertCount(2, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2520,7 +2520,7 @@ trait DatabasesBase
         /**
          * Test with ASC order and after.
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2535,7 +2535,7 @@ trait DatabasesBase
         $this->assertEquals(2019, $base['body']['rows'][2]['releaseYear']);
         $this->assertCount(3, $base['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2552,7 +2552,7 @@ trait DatabasesBase
         /**
          * Test with DESC order and after.
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2567,7 +2567,7 @@ trait DatabasesBase
         $this->assertEquals(2019, $base['body']['rows'][0]['releaseYear']);
         $this->assertCount(3, $base['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2590,7 +2590,7 @@ trait DatabasesBase
     public function testListRowsLimitAndOffset(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2604,7 +2604,7 @@ trait DatabasesBase
         $this->assertEquals(1944, $rows['body']['rows'][0]['releaseYear']);
         $this->assertCount(1, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2629,7 +2629,7 @@ trait DatabasesBase
     public function testRowsListQueries(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2642,7 +2642,7 @@ trait DatabasesBase
         $this->assertEquals(1944, $rows['body']['rows'][0]['releaseYear']);
         $this->assertCount(1, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2655,7 +2655,7 @@ trait DatabasesBase
         $this->assertEquals(1944, $rows['body']['rows'][0]['releaseYear']);
         $this->assertCount(1, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2668,7 +2668,7 @@ trait DatabasesBase
         $this->assertEquals(2017, $rows['body']['rows'][0]['releaseYear']);
         $this->assertCount(1, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2682,7 +2682,7 @@ trait DatabasesBase
         $this->assertEquals(2017, $rows['body']['rows'][1]['releaseYear']);
         $this->assertCount(2, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2694,7 +2694,7 @@ trait DatabasesBase
         $this->assertEquals(400, $rows['headers']['status-code']);
         $this->assertEquals('Invalid query: Syntax error', $rows['body']['message']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2706,7 +2706,7 @@ trait DatabasesBase
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(2, $rows['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2718,7 +2718,7 @@ trait DatabasesBase
         $this->assertCount(1, $rows['body']['rows']);
         $this->assertEquals('Captain America', $rows['body']['rows'][0]['title']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2731,7 +2731,7 @@ trait DatabasesBase
         $this->assertEquals('Spider-Man: Far From Home', $rows['body']['rows'][0]['title']);
         $this->assertEquals('Spider-Man: Homecoming', $rows['body']['rows'][1]['title']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2742,7 +2742,7 @@ trait DatabasesBase
 
         $this->assertCount(3, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2753,7 +2753,7 @@ trait DatabasesBase
 
         $this->assertCount(0, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2765,7 +2765,7 @@ trait DatabasesBase
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(3, $rows['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2777,7 +2777,7 @@ trait DatabasesBase
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(0, $rows['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2789,7 +2789,7 @@ trait DatabasesBase
         $this->assertEquals(400, $rows['headers']['status-code']);
         $this->assertEquals('Invalid query: Query value is invalid for attribute "birthDay"', $rows['body']['message']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2803,7 +2803,7 @@ trait DatabasesBase
         $this->assertEquals('1975-06-12T18:12:55.000+00:00', $rows['body']['rows'][1]['birthDay']);
         $this->assertCount(2, $rows['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2824,7 +2824,7 @@ trait DatabasesBase
             $conditions[] = $i;
         }
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2841,7 +2841,7 @@ trait DatabasesBase
             $value .= "[" . $i . "] Too long title to cross 2k chars query limit ";
         }
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2854,7 +2854,7 @@ trait DatabasesBase
         //$this->assertEquals(400, $rows['headers']['status-code']);
 
         // Todo: Disabled for CL - Uncomment after ProxyDatabase cleanup for find method
-        // $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        // $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
         //     'content-type' => 'application/json',
         //     'x-appwrite-project' => $this->getProject()['$id'],
         // ], $this->getHeaders()), [
@@ -2874,7 +2874,7 @@ trait DatabasesBase
     public function testUpdateRow(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2907,7 +2907,7 @@ trait DatabasesBase
         $this->assertContains(Permission::update(Role::user($this->getUser()['$id'])), $row['body']['$permissions']);
         $this->assertContains(Permission::delete(Role::user($this->getUser()['$id'])), $row['body']['$permissions']);
 
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2932,7 +2932,7 @@ trait DatabasesBase
         $this->assertContains(Permission::update(Role::users()), $row['body']['$permissions']);
         $this->assertContains(Permission::delete(Role::users()), $row['body']['$permissions']);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2946,7 +2946,7 @@ trait DatabasesBase
         $this->assertEquals($row['body']['title'], 'Thor: Ragnarok');
         $this->assertEquals($row['body']['releaseYear'], 2017);
 
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-timestamp' => DateTime::formatTz(DateTime::now()),
@@ -2962,7 +2962,7 @@ trait DatabasesBase
          * Test for failure
          */
 
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-timestamp' => 'invalid',
@@ -2976,7 +2976,7 @@ trait DatabasesBase
         $this->assertEquals('Invalid X-Appwrite-Timestamp header value', $response['body']['message']);
         $this->assertEquals(Exception::GENERAL_ARGUMENT_INVALID, $response['body']['type']);
 
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-timestamp' => DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -1000)),
@@ -2999,7 +2999,7 @@ trait DatabasesBase
     public function testDeleteRow(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3021,21 +3021,21 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row['headers']['status-code']);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals(200, $row['headers']['status-code']);
 
-        $row = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals(204, $row['headers']['status-code']);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3059,7 +3059,7 @@ trait DatabasesBase
         $this->assertEquals('InvalidDocumentDatabase', $database['body']['name']);
 
         $databaseId = $database['body']['$id'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3078,7 +3078,7 @@ trait DatabasesBase
 
         $tableId = $table['body']['$id'];
 
-        $email = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email', array_merge([
+        $email = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3087,7 +3087,7 @@ trait DatabasesBase
             'required' => false,
         ]);
 
-        $enum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum', array_merge([
+        $enum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3097,7 +3097,7 @@ trait DatabasesBase
             'required' => false,
         ]);
 
-        $ip = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip', array_merge([
+        $ip = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3106,7 +3106,7 @@ trait DatabasesBase
             'required' => false,
         ]);
 
-        $url = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url', array_merge([
+        $url = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3116,7 +3116,7 @@ trait DatabasesBase
             'required' => false,
         ]);
 
-        $range = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $range = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3128,7 +3128,7 @@ trait DatabasesBase
         ]);
 
         // TODO@kodumbeats min and max are rounded in error message
-        $floatRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float', array_merge([
+        $floatRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3139,7 +3139,7 @@ trait DatabasesBase
             'max' => 1.4,
         ]);
 
-        $probability = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float', array_merge([
+        $probability = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3151,7 +3151,7 @@ trait DatabasesBase
             'max' => 1,
         ]);
 
-        $upperBound = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $upperBound = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3161,7 +3161,7 @@ trait DatabasesBase
             'max' => 10,
         ]);
 
-        $lowerBound = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $lowerBound = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3175,7 +3175,7 @@ trait DatabasesBase
          * Test for failure
          */
 
-        $invalidRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $invalidRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
@@ -3185,7 +3185,7 @@ trait DatabasesBase
             'max' => 3,
         ]);
 
-        $defaultArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $defaultArray = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
@@ -3195,7 +3195,7 @@ trait DatabasesBase
             'array' => true,
         ]);
 
-        $defaultRequired = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $defaultRequired = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3205,7 +3205,7 @@ trait DatabasesBase
             'default' => 12
         ]);
 
-        $enumDefault = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum', array_merge([
+        $enumDefault = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3215,7 +3215,7 @@ trait DatabasesBase
             'default' => 'south'
         ]);
 
-        $enumDefaultStrict = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum', array_merge([
+        $enumDefaultStrict = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3225,7 +3225,7 @@ trait DatabasesBase
             'default' => 'NORTH'
         ]);
 
-        $goodDatetime = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime', array_merge([
+        $goodDatetime = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3235,7 +3235,7 @@ trait DatabasesBase
             'default' => null
         ]);
 
-        $datetimeDefault = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime', array_merge([
+        $datetimeDefault = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3267,7 +3267,7 @@ trait DatabasesBase
         // wait for worker to add attributes
         sleep(3);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -3279,7 +3279,7 @@ trait DatabasesBase
          * Test for successful validation
          */
 
-        $goodEmail = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $goodEmail = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3294,7 +3294,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $goodEnum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $goodEnum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3309,7 +3309,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $goodIp = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $goodIp = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3324,7 +3324,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $goodUrl = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $goodUrl = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3339,7 +3339,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $goodRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $goodRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3354,7 +3354,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $goodFloatRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $goodFloatRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3369,7 +3369,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $goodProbability = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $goodProbability = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3384,7 +3384,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $notTooHigh = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $notTooHigh = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3399,7 +3399,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $notTooLow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $notTooLow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3428,7 +3428,7 @@ trait DatabasesBase
          * Test that custom validators reject documents
          */
 
-        $badEmail = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badEmail = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3443,7 +3443,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $badEnum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badEnum = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3458,7 +3458,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $badIp = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badIp = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3473,7 +3473,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $badUrl = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badUrl = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3488,7 +3488,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $badRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3503,7 +3503,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $badFloatRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badFloatRange = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3518,7 +3518,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $badProbability = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badProbability = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3533,7 +3533,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $tooHigh = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $tooHigh = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3548,7 +3548,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $tooLow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $tooLow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3563,7 +3563,7 @@ trait DatabasesBase
             ]
         ]);
 
-        $badTime = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $badTime = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3604,7 +3604,7 @@ trait DatabasesBase
     public function testDefaultPermissions(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3637,7 +3637,7 @@ trait DatabasesBase
 
         // Updated Permissions
 
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3665,7 +3665,7 @@ trait DatabasesBase
             Permission::update(Role::user($this->getUser()['$id'])),
         ], $row['body']['$permissions']);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3682,7 +3682,7 @@ trait DatabasesBase
 
         // Reset Permissions
 
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3701,7 +3701,7 @@ trait DatabasesBase
         $this->assertEquals([], $row['body']['$permissions']);
 
         // Check client side can no longer read the row.
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3733,7 +3733,7 @@ trait DatabasesBase
 
         $databaseId = $database['body']['$id'];
         $user = $this->getUser()['$id'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3757,7 +3757,7 @@ trait DatabasesBase
 
         sleep(2);
 
-        $attribute = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $attribute = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3773,7 +3773,7 @@ trait DatabasesBase
         // wait for db to add attribute
         sleep(2);
 
-        $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/indexes', array_merge([
+        $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3789,7 +3789,7 @@ trait DatabasesBase
         // wait for db to add attribute
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3806,7 +3806,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3822,7 +3822,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', [
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3839,7 +3839,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row3['headers']['status-code']);
 
-        $rowsUser1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $rowsUser1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3848,7 +3848,7 @@ trait DatabasesBase
         $this->assertEquals(3, $rowsUser1['body']['total']);
         $this->assertCount(3, $rowsUser1['body']['rows']);
 
-        $row3GetWithCollectionRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row3['body']['$id'], array_merge([
+        $row3GetWithCollectionRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row3['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3879,7 +3879,7 @@ trait DatabasesBase
         ]);
         $session2 = $session2['cookies']['a_session_' . $this->getProject()['$id']];
 
-        $row3GetWithDocumentRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row3['body']['$id'], [
+        $row3GetWithDocumentRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row3['body']['$id'], [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -3889,7 +3889,7 @@ trait DatabasesBase
         // Current user has no table permissions but has read permission for this row
         $this->assertEquals(200, $row3GetWithDocumentRead['headers']['status-code']);
 
-        $row2GetFailure = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row2['body']['$id'], [
+        $row2GetFailure = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row2['body']['$id'], [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -3899,7 +3899,7 @@ trait DatabasesBase
         // Current user has no table or row permissions for this row
         $this->assertEquals(404, $row2GetFailure['headers']['status-code']);
 
-        $rowsUser2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', [
+        $rowsUser2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -3926,7 +3926,7 @@ trait DatabasesBase
 
         $databaseId = $database['body']['$id'];
         $user = $this->getUser()['$id'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3947,7 +3947,7 @@ trait DatabasesBase
 
         $tableId = $table['body']['$id'];
 
-        $attribute = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $attribute = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3962,7 +3962,7 @@ trait DatabasesBase
 
         \sleep(2);
 
-        $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/indexes', array_merge([
+        $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3977,7 +3977,7 @@ trait DatabasesBase
 
         \sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -3994,7 +3994,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4010,7 +4010,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', [
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4027,7 +4027,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $row3['headers']['status-code']);
 
-        $rowsUser1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $rowsUser1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4036,7 +4036,7 @@ trait DatabasesBase
         $this->assertEquals(3, $rowsUser1['body']['total']);
         $this->assertCount(3, $rowsUser1['body']['rows']);
 
-        $row3GetWithCollectionRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row3['body']['$id'], array_merge([
+        $row3GetWithCollectionRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row3['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4067,7 +4067,7 @@ trait DatabasesBase
         ]);
         $session2 = $session2['cookies']['a_session_' . $this->getProject()['$id']];
 
-        $row3GetWithDocumentRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row3['body']['$id'], [
+        $row3GetWithDocumentRead = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row3['body']['$id'], [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -4077,7 +4077,7 @@ trait DatabasesBase
         // other2 has no table permissions and row permissions are disabled
         $this->assertEquals(404, $row3GetWithDocumentRead['headers']['status-code']);
 
-        $rowsUser2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', [
+        $rowsUser2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -4088,7 +4088,7 @@ trait DatabasesBase
         $this->assertEquals(401, $rowsUser2['headers']['status-code']);
 
         // Enable row permissions
-        $this->client->call(CLient::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $tableId, [
+        $this->client->call(CLient::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4097,7 +4097,7 @@ trait DatabasesBase
             'rowSecurity' => true,
         ]);
 
-        $rowsUser2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', [
+        $rowsUser2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -4115,7 +4115,7 @@ trait DatabasesBase
     public function testUniqueIndexDuplicate(array $data): array
     {
         $databaseId = $data['databaseId'];
-        $uniqueIndex = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/indexes', array_merge([
+        $uniqueIndex = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4130,7 +4130,7 @@ trait DatabasesBase
         sleep(2);
 
         // test for failure
-        $duplicate = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $duplicate = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4153,7 +4153,7 @@ trait DatabasesBase
         $this->assertEquals(409, $duplicate['headers']['status-code']);
 
         // Test for exception when updating row to conflict
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4176,7 +4176,7 @@ trait DatabasesBase
         $this->assertEquals(201, $row['headers']['status-code']);
 
         // Test for exception when updating row to conflict
-        $duplicate = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/rows/' . $row['body']['$id'], array_merge([
+        $duplicate = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4215,7 +4215,7 @@ trait DatabasesBase
             'x-appwrite-key' => $this->getProject()['apiKey']
         ];
 
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['moviesId'] . '/rows', $headers, [
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['moviesId'] . '/rows', $headers, [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Creation Date Test',
@@ -4231,7 +4231,7 @@ trait DatabasesBase
 
         \sleep(1);
 
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, $headers, [
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, $headers, [
             'data' => [
                 'title' => 'Updated Date Test',
             ]
@@ -4245,7 +4245,7 @@ trait DatabasesBase
 
         \sleep(1);
 
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['moviesId'] . '/rows/' . $rowId, $headers, [
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['moviesId'] . '/rows/' . $rowId, $headers, [
             'data' => [
                 'title' => 'Again Updated Date Test',
                 '$createdAt' => '2022-08-01 13:09:23.040',
@@ -4281,7 +4281,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create table
-        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4303,7 +4303,7 @@ trait DatabasesBase
         $moviesId = $movies['body']['$id'];
 
         // create attribute
-        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/columns/string', array_merge([
+        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4319,7 +4319,7 @@ trait DatabasesBase
         sleep(2);
 
         // add row
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4343,7 +4343,7 @@ trait DatabasesBase
         $this->assertContains(Permission::delete(Role::any()), $row['body']['$permissions']);
 
         // Send only read permission
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4356,7 +4356,7 @@ trait DatabasesBase
         $this->assertCount(1, $row['body']['$permissions']);
 
         // Send only mutation permissions
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/rows/' . $id, array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/rows/' . $id, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4374,7 +4374,7 @@ trait DatabasesBase
         }
 
         // remove table
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $moviesId, array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4392,7 +4392,7 @@ trait DatabasesBase
         /**
          * Test for SUCCESS
          */
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4405,7 +4405,7 @@ trait DatabasesBase
 
         $tableId = $table['body']['$id'];
 
-        $true = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean', array_merge([
+        $true = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4417,7 +4417,7 @@ trait DatabasesBase
 
         $this->assertEquals(202, $true['headers']['status-code']);
 
-        $false = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean', array_merge([
+        $false = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4437,7 +4437,7 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
 
-        $person = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $person = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4455,7 +4455,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $person['headers']['status-code']);
 
-        $library = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $library = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4472,7 +4472,7 @@ trait DatabasesBase
 
         $this->assertEquals(201, $library['headers']['status-code']);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4484,7 +4484,7 @@ trait DatabasesBase
 
         sleep(1); // Wait for worker
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4498,7 +4498,7 @@ trait DatabasesBase
 
         sleep(1); // Wait for worker
 
-        $libraryName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $library['body']['$id'] . '/columns/string', array_merge([
+        $libraryName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $library['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4516,7 +4516,7 @@ trait DatabasesBase
         $this->assertEquals('relationship', $relation['body']['type']);
         $this->assertEquals('processing', $relation['body']['status']);
 
-        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/columns', array_merge([
+        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/columns', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4531,7 +4531,7 @@ trait DatabasesBase
         $this->assertEquals('person', $columns[1]['twoWayKey']);
         $this->assertEquals(Database::RELATION_MUTATE_CASCADE, $columns[1]['onDelete']);
 
-        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/grids/tables/{$person['body']['$id']}/columns/library", array_merge([
+        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/tablesdb/tables/{$person['body']['$id']}/columns/library", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4548,7 +4548,7 @@ trait DatabasesBase
         $this->assertEquals('person', $attribute['body']['twoWayKey']);
         $this->assertEquals(Database::RELATION_MUTATE_CASCADE, $attribute['body']['onDelete']);
 
-        $person1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows', array_merge([
+        $person1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4572,7 +4572,7 @@ trait DatabasesBase
         $this->assertEquals('Library 1', $person1['body']['library']['libraryName']);
 
         // Create without nested ID
-        $person2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows', array_merge([
+        $person2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4603,7 +4603,7 @@ trait DatabasesBase
         $this->assertArrayNotHasKey('$internalId', $person1['body']);
         $this->assertArrayNotHasKey('$internalId', $person1['body']['library']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4617,7 +4617,7 @@ trait DatabasesBase
         $this->assertEquals('Library 1', $rows['body']['rows'][0]['library']['libraryName']);
         $this->assertArrayHasKey('fullName', $rows['body']['rows'][0]);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4629,7 +4629,7 @@ trait DatabasesBase
         $this->assertEquals(400, $rows['headers']['status-code']);
         $this->assertEquals('Invalid query: Cannot query nested attribute on: library', $rows['body']['message']);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/columns/library', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/columns/library', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4639,7 +4639,7 @@ trait DatabasesBase
 
         $this->assertEquals(204, $response['headers']['status-code']);
 
-        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/grids/tables/{$person['body']['$id']}/columns/library", array_merge([
+        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/tablesdb/tables/{$person['body']['$id']}/columns/library", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4647,7 +4647,7 @@ trait DatabasesBase
 
         $this->assertEquals(404, $attribute['headers']['status-code']);
 
-        $person1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $person['body']['$id'] . '/rows/' . $person1['body']['$id'], array_merge([
+        $person1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $person['body']['$id'] . '/rows/' . $person1['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4655,7 +4655,7 @@ trait DatabasesBase
         $this->assertArrayNotHasKey('library', $person1['body']);
 
         //Test Deletion of related twoKey
-        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $library['body']['$id'] . '/columns', array_merge([
+        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $library['body']['$id'] . '/columns', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4682,7 +4682,7 @@ trait DatabasesBase
         $libraryCollection = $data['libraryCollection'];
 
         // One person can own several libraries
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $personCollection . '/columns/relationship', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $personCollection . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4696,7 +4696,7 @@ trait DatabasesBase
 
         sleep(1);
 
-        $libraryAttributesResponse = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $libraryCollection . '/columns', array_merge([
+        $libraryAttributesResponse = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $libraryCollection . '/columns', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4706,7 +4706,7 @@ trait DatabasesBase
         $this->assertEquals(2, $libraryAttributesResponse['body']['total']);
         $this->assertEquals('person_one_to_many', $libraryAttributesResponse['body']['columns'][1]['key']);
 
-        $libraryCollectionResponse = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $libraryCollection, array_merge([
+        $libraryCollectionResponse = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $libraryCollection, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4715,7 +4715,7 @@ trait DatabasesBase
         $this->assertIsArray($libraryCollectionResponse['body']['columns']);
         $this->assertCount(2, $libraryCollectionResponse['body']['columns']);
 
-        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/grids/tables/{$personCollection}/columns/libraries", array_merge([
+        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/tablesdb/tables/{$personCollection}/columns/libraries", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4732,7 +4732,7 @@ trait DatabasesBase
         $this->assertEquals('person_one_to_many', $attribute['body']['twoWayKey']);
         $this->assertEquals('restrict', $attribute['body']['onDelete']);
 
-        $person2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $personCollection . '/rows', array_merge([
+        $person2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $personCollection . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4771,7 +4771,7 @@ trait DatabasesBase
         $this->assertArrayHasKey('libraries', $person2['body']);
         $this->assertEquals(2, count($person2['body']['libraries']));
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $personCollection . '/rows/' . $person2['body']['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $personCollection . '/rows/' . $person2['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4785,7 +4785,7 @@ trait DatabasesBase
         $this->assertArrayHasKey('libraries', $response['body']);
         $this->assertEquals(2, count($response['body']['libraries']));
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $libraryCollection . '/rows/library11', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $libraryCollection . '/rows/library11', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4798,7 +4798,7 @@ trait DatabasesBase
         $this->assertArrayHasKey('person_one_to_many', $response['body']);
         $this->assertEquals('person10', $response['body']['person_one_to_many']['$id']);
 
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $personCollection . '/columns/libraries/relationship', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $personCollection . '/columns/libraries/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4808,7 +4808,7 @@ trait DatabasesBase
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/grids/tables/{$personCollection}/columns/libraries", array_merge([
+        $attribute = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/tablesdb/tables/{$personCollection}/columns/libraries", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4835,7 +4835,7 @@ trait DatabasesBase
         $databaseId = $data['databaseId'];
 
         // Create album table
-        $albums = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $albums = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4850,7 +4850,7 @@ trait DatabasesBase
         ]);
 
         // Create album name attribute
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $albums['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $albums['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4861,7 +4861,7 @@ trait DatabasesBase
         ]);
 
         // Create artist table
-        $artists = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $artists = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4876,7 +4876,7 @@ trait DatabasesBase
         ]);
 
         // Create artist name attribute
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $artists['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $artists['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4887,7 +4887,7 @@ trait DatabasesBase
         ]);
 
         // Create relationship
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $albums['body']['$id'] . '/columns/relationship', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $albums['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4917,7 +4917,7 @@ trait DatabasesBase
         ];
 
         // Create album
-        $album = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $albums['body']['$id'] . '/rows', array_merge([
+        $album = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $albums['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4939,7 +4939,7 @@ trait DatabasesBase
         $this->assertEquals($permissions, $album['body']['$permissions']);
         $this->assertEquals($permissions, $album['body']['artist']['$permissions']);
 
-        $album = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $albums['body']['$id'] . '/rows/album1', array_merge([
+        $album = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $albums['body']['$id'] . '/rows/album1', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4955,7 +4955,7 @@ trait DatabasesBase
         $this->assertEquals($permissions, $album['body']['$permissions']);
         $this->assertEquals($permissions, $album['body']['artist']['$permissions']);
 
-        $artist = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $artists['body']['$id'] . '/rows/' . $album['body']['artist']['$id'], array_merge([
+        $artist = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $artists['body']['$id'] . '/rows/' . $album['body']['artist']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4987,7 +4987,7 @@ trait DatabasesBase
         $databaseId = $data['databaseId'];
 
         // Create sports table
-        $sports = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $sports = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5002,7 +5002,7 @@ trait DatabasesBase
         ]);
 
         // Create sport name attribute
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $sports['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $sports['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5013,7 +5013,7 @@ trait DatabasesBase
         ]);
 
         // Create player table
-        $players = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $players = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5028,7 +5028,7 @@ trait DatabasesBase
         ]);
 
         // Create player name attribute
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $players['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $players['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5039,7 +5039,7 @@ trait DatabasesBase
         ]);
 
         // Create relationship
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $sports['body']['$id'] . '/columns/relationship', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $sports['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5070,7 +5070,7 @@ trait DatabasesBase
         ];
 
         // Create sport
-        $sport = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $sports['body']['$id'] . '/rows', array_merge([
+        $sport = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $sports['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5100,7 +5100,7 @@ trait DatabasesBase
         $this->assertEquals($permissions, $sport['body']['players'][0]['$permissions']);
         $this->assertEquals($permissions, $sport['body']['players'][1]['$permissions']);
 
-        $sport = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $sports['body']['$id'] . '/rows/sport1', array_merge([
+        $sport = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $sports['body']['$id'] . '/rows/sport1', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5118,7 +5118,7 @@ trait DatabasesBase
         $this->assertEquals($permissions, $sport['body']['players'][0]['$permissions']);
         $this->assertEquals($permissions, $sport['body']['players'][1]['$permissions']);
 
-        $player = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $players['body']['$id'] . '/rows/' . $sport['body']['players'][0]['$id'], array_merge([
+        $player = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $players['body']['$id'] . '/rows/' . $sport['body']['players'][0]['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5147,7 +5147,7 @@ trait DatabasesBase
      */
     public function testValidateOperators(array $data): void
     {
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['personCollection'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['personCollection'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5166,7 +5166,7 @@ trait DatabasesBase
         $this->assertEquals('Stevie Wonder', $response['body']['rows'][0]['fullName']);
         $this->assertEquals(2, count($response['body']['rows'][0]['libraries']));
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['personCollection'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['personCollection'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5190,7 +5190,7 @@ trait DatabasesBase
      */
     public function testSelectQueries(array $data): void
     {
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['personCollection'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['personCollection'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5205,7 +5205,7 @@ trait DatabasesBase
         $this->assertArrayNotHasKey('$databaseId', $response['body']['rows'][0]);
         $this->assertArrayNotHasKey('$tableId', $response['body']['rows'][0]);
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['personCollection'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['personCollection'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5219,7 +5219,7 @@ trait DatabasesBase
         $this->assertArrayNotHasKey('$databaseId', $row);
         $this->assertArrayNotHasKey('$tableId', $row);
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['personCollection'] . '/rows/' . $row['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['personCollection'] . '/rows/' . $row['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5256,7 +5256,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $presidents = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $presidents = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5273,7 +5273,7 @@ trait DatabasesBase
         $this->assertEquals($presidents['body']['name'], 'USA Presidents');
 
         // Create Attributes
-        $firstName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $presidents['body']['$id'] . '/columns/string', array_merge([
+        $firstName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $presidents['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5284,7 +5284,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $firstName['headers']['status-code']);
 
-        $lastName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $presidents['body']['$id'] . '/columns/string', array_merge([
+        $lastName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $presidents['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5299,7 +5299,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $presidents['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $presidents['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5314,7 +5314,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $presidents['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $presidents['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5329,7 +5329,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $presidents['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $presidents['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5347,7 +5347,7 @@ trait DatabasesBase
 
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $presidents['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $presidents['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -5392,7 +5392,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5409,7 +5409,7 @@ trait DatabasesBase
         $this->assertEquals($movies['body']['name'], 'Movies');
 
         // Create Attributes
-        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $movies['body']['$id'] . '/columns/string', array_merge([
+        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $movies['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5420,7 +5420,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $title['headers']['status-code']);
 
-        $genre = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $movies['body']['$id'] . '/columns/string', array_merge([
+        $genre = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $movies['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5435,7 +5435,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $movies['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $movies['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5450,7 +5450,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $movies['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $movies['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5465,7 +5465,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $movies['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $movies['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5484,7 +5484,7 @@ trait DatabasesBase
         // Test notContains query - should return movies that don't contain "Spider" in title
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $movies['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $movies['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -5528,7 +5528,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $books = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $books = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5545,7 +5545,7 @@ trait DatabasesBase
         $this->assertEquals($books['body']['name'], 'Books');
 
         // Create Attributes
-        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $books['body']['$id'] . '/columns/string', array_merge([
+        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $books['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5556,7 +5556,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $title['headers']['status-code']);
 
-        $description = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $books['body']['$id'] . '/columns/string', array_merge([
+        $description = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $books['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5570,7 +5570,7 @@ trait DatabasesBase
 
         \sleep(2);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $books['body']['$id'] . '/indexes', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $books['body']['$id'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5580,7 +5580,7 @@ trait DatabasesBase
             'columns' => ['description'],
         ]);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $books['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $books['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5595,7 +5595,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $books['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $books['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5610,7 +5610,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $books['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $books['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5629,7 +5629,7 @@ trait DatabasesBase
         // Test notSearch query - should return books that don't have "space" in the description
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $books['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $books['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -5670,7 +5670,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $products = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $products = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5687,7 +5687,7 @@ trait DatabasesBase
         $this->assertEquals($products['body']['name'], 'Products');
 
         // Create Attributes
-        $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $products['body']['$id'] . '/columns/string', array_merge([
+        $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $products['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5698,7 +5698,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $name['headers']['status-code']);
 
-        $price = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $products['body']['$id'] . '/columns/float', array_merge([
+        $price = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $products['body']['$id'] . '/columns/float', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5712,7 +5712,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $products['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $products['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5727,7 +5727,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $products['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $products['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5742,7 +5742,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $products['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $products['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5761,7 +5761,7 @@ trait DatabasesBase
         // Test notBetween query - should return products NOT priced between 10 and 50
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $products['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $products['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -5802,7 +5802,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $employees = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $employees = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5819,7 +5819,7 @@ trait DatabasesBase
         $this->assertEquals($employees['body']['name'], 'Employees');
 
         // Create Attributes
-        $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $employees['body']['$id'] . '/columns/string', array_merge([
+        $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $employees['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5830,7 +5830,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $name['headers']['status-code']);
 
-        $department = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $employees['body']['$id'] . '/columns/string', array_merge([
+        $department = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $employees['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5845,7 +5845,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $employees['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $employees['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5860,7 +5860,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $employees['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $employees['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5875,7 +5875,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $employees['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $employees['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5894,7 +5894,7 @@ trait DatabasesBase
         // Test notStartsWith query - should return employees whose names don't start with "John"
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $employees['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $employees['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -5935,7 +5935,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $files = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $files = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5952,7 +5952,7 @@ trait DatabasesBase
         $this->assertEquals($files['body']['name'], 'Files');
 
         // Create Attributes
-        $filename = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $files['body']['$id'] . '/columns/string', array_merge([
+        $filename = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $files['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5963,7 +5963,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $filename['headers']['status-code']);
 
-        $type = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $files['body']['$id'] . '/columns/string', array_merge([
+        $type = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $files['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5978,7 +5978,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $files['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $files['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5993,7 +5993,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row1['headers']['status-code']);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $files['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $files['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6008,7 +6008,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(201, $row2['headers']['status-code']);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $files['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $files['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6027,7 +6027,7 @@ trait DatabasesBase
         // Test notEndsWith query - should return files that don't end with ".pdf"
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $files['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $files['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -6068,7 +6068,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $posts = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $posts = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6085,7 +6085,7 @@ trait DatabasesBase
         $this->assertEquals($posts['body']['name'], 'Posts');
 
         // Create Attributes
-        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $posts['body']['$id'] . '/columns/string', array_merge([
+        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $posts['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6096,7 +6096,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $title['headers']['status-code']);
 
-        $content = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $posts['body']['$id'] . '/columns/string', array_merge([
+        $content = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $posts['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6111,7 +6111,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $posts['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $posts['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6129,7 +6129,7 @@ trait DatabasesBase
         // Sleep to ensure different creation times
         sleep(1);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $posts['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $posts['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6150,7 +6150,7 @@ trait DatabasesBase
         // Sleep again
         sleep(1);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $posts['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $posts['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6169,7 +6169,7 @@ trait DatabasesBase
         // Test createdBefore query - should return posts created before the second post
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $posts['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $posts['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -6209,7 +6209,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $events = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $events = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6226,7 +6226,7 @@ trait DatabasesBase
         $this->assertEquals($events['body']['name'], 'Events');
 
         // Create Attributes
-        $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $events['body']['$id'] . '/columns/string', array_merge([
+        $name = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $events['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6237,7 +6237,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $name['headers']['status-code']);
 
-        $description = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $events['body']['$id'] . '/columns/string', array_merge([
+        $description = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $events['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6252,7 +6252,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $events['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $events['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6270,7 +6270,7 @@ trait DatabasesBase
         // Sleep to ensure different creation times
         sleep(1);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $events['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $events['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6291,7 +6291,7 @@ trait DatabasesBase
         // Sleep again
         sleep(1);
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $events['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $events['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6310,7 +6310,7 @@ trait DatabasesBase
         // Test createdAfter query - should return events created after the second event
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $events['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $events['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -6350,7 +6350,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $tasks = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tasks = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6368,7 +6368,7 @@ trait DatabasesBase
         $this->assertEquals($tasks['body']['name'], 'Tasks');
 
         // Create Attributes
-        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/columns/string', array_merge([
+        $title = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6379,7 +6379,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $title['headers']['status-code']);
 
-        $status = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/columns/string', array_merge([
+        $status = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6394,7 +6394,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6411,7 +6411,7 @@ trait DatabasesBase
         $this->assertEquals(201, $row1['headers']['status-code']);
         $taskOneId = $row1['body']['$id'];
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6428,7 +6428,7 @@ trait DatabasesBase
         $this->assertEquals(201, $row2['headers']['status-code']);
         $taskTwoId = $row2['body']['$id'];
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6447,7 +6447,7 @@ trait DatabasesBase
 
         // Update first task
         sleep(1);
-        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/rows/' . $taskOneId, array_merge([
+        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/rows/' . $taskOneId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6458,7 +6458,7 @@ trait DatabasesBase
 
         // Update second task and get its updated time
         sleep(1);
-        $updatedTaskTwo = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/rows/' . $taskTwoId, array_merge([
+        $updatedTaskTwo = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/rows/' . $taskTwoId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6470,7 +6470,7 @@ trait DatabasesBase
 
         // Update third task
         sleep(1);
-        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/rows/' . $taskThreeId, array_merge([
+        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/rows/' . $taskThreeId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6482,7 +6482,7 @@ trait DatabasesBase
         // Test updatedBefore query - should return tasks updated before the second task's update time
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $tasks['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tasks['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -6523,7 +6523,7 @@ trait DatabasesBase
         $databaseId = $database['body']['$id'];
 
         // Create Collection
-        $orders = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $orders = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6541,7 +6541,7 @@ trait DatabasesBase
         $this->assertEquals($orders['body']['name'], 'Orders');
 
         // Create Attributes
-        $orderNumber = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/columns/string', array_merge([
+        $orderNumber = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6552,7 +6552,7 @@ trait DatabasesBase
         ]);
         $this->assertEquals(202, $orderNumber['headers']['status-code']);
 
-        $status = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/columns/string', array_merge([
+        $status = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6567,7 +6567,7 @@ trait DatabasesBase
         // Wait for worker
         sleep(2);
 
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6584,7 +6584,7 @@ trait DatabasesBase
         $this->assertEquals(201, $row1['headers']['status-code']);
         $orderOneId = $row1['body']['$id'];
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6601,7 +6601,7 @@ trait DatabasesBase
         $this->assertEquals(201, $row2['headers']['status-code']);
         $orderTwoId = $row2['body']['$id'];
 
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6620,7 +6620,7 @@ trait DatabasesBase
 
         // Update first order
         sleep(1);
-        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/rows/' . $orderOneId, array_merge([
+        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/rows/' . $orderOneId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6631,7 +6631,7 @@ trait DatabasesBase
 
         // Update second order and get its updated time
         sleep(1);
-        $updatedOrderTwo = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/rows/' . $orderTwoId, array_merge([
+        $updatedOrderTwo = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/rows/' . $orderTwoId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6643,7 +6643,7 @@ trait DatabasesBase
 
         // Update third order
         sleep(1);
-        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/rows/' . $orderThreeId, array_merge([
+        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/rows/' . $orderThreeId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6655,7 +6655,7 @@ trait DatabasesBase
         // Test updatedAfter query - should return orders updated after the second order's update time
         $rows = $this->client->call(
             Client::METHOD_GET,
-            '/databases/' . $databaseId . '/grids/tables/' . $orders['body']['$id'] . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $orders['body']['$id'] . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -6683,7 +6683,7 @@ trait DatabasesBase
     {
         $databaseId = $data['databaseId'];
 
-        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6697,7 +6697,7 @@ trait DatabasesBase
             ],
         ]);
 
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6714,7 +6714,7 @@ trait DatabasesBase
         $table1 = $table1['body']['$id'];
         $table2 = $table2['body']['$id'];
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1 . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1 . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6724,7 +6724,7 @@ trait DatabasesBase
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table2 . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2 . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6734,7 +6734,7 @@ trait DatabasesBase
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1 . '/columns/relationship', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1 . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6747,7 +6747,7 @@ trait DatabasesBase
 
         sleep(1);
 
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1 . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1 . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id']
         ], $this->getHeaders()), [
@@ -6762,7 +6762,7 @@ trait DatabasesBase
             ],
         ]);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1 . '/rows/' . $row['body']['$id'], array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1 . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id']
         ], $this->getHeaders()), [
@@ -6779,7 +6779,7 @@ trait DatabasesBase
      */
     public function testTimeout(array $data): void
     {
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6799,7 +6799,7 @@ trait DatabasesBase
             'databaseId' => $table['body']['databaseId']
         ];
 
-        $longtext = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/columns/string', array_merge([
+        $longtext = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6813,7 +6813,7 @@ trait DatabasesBase
         $this->assertEquals($longtext['headers']['status-code'], 202);
 
         for ($i = 0; $i < 10; $i++) {
-            $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+            $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()), [
@@ -6829,7 +6829,7 @@ trait DatabasesBase
             ]);
         }
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-timeout' => 1,
@@ -6857,7 +6857,7 @@ trait DatabasesBase
         ]);
         $databaseId = $database['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6873,7 +6873,7 @@ trait DatabasesBase
         $tableId = $table['body']['$id'];
 
         // Add integer attribute
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6885,7 +6885,7 @@ trait DatabasesBase
         \sleep(3);
 
         // Create row with initial count = 5
-        $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -6903,7 +6903,7 @@ trait DatabasesBase
         $rowId = $doc['body']['$id'];
 
         // Increment by default 1
-        $inc = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId/count/increment", array_merge([
+        $inc = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId/count/increment", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]));
@@ -6911,14 +6911,14 @@ trait DatabasesBase
         $this->assertEquals(6, $inc['body']['count']);
 
         // Verify count = 6
-        $get = $this->client->call(Client::METHOD_GET, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId", array_merge([
+        $get = $this->client->call(Client::METHOD_GET, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
         $this->assertEquals(6, $get['body']['count']);
 
         // Increment by custom value 4
-        $inc2 = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId/count/increment", array_merge([
+        $inc2 = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId/count/increment", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]), [
@@ -6927,28 +6927,28 @@ trait DatabasesBase
         $this->assertEquals(200, $inc2['headers']['status-code']);
         $this->assertEquals(10, $inc2['body']['count']);
 
-        $get2 = $this->client->call(Client::METHOD_GET, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId", array_merge([
+        $get2 = $this->client->call(Client::METHOD_GET, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
         $this->assertEquals(10, $get2['body']['count']);
 
         // Test max limit exceeded
-        $err = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId/count/increment", array_merge([
+        $err = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId/count/increment", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]), ['max' => 8]);
         $this->assertEquals(400, $err['headers']['status-code']);
 
         // Test attribute not found
-        $notFound = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId/unknown/increment", array_merge([
+        $notFound = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId/unknown/increment", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]));
         $this->assertEquals(404, $notFound['headers']['status-code']);
 
         // Test decrement with value 0
-        $inc3 = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId/count/increment", array_merge([
+        $inc3 = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId/count/increment", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]), [
@@ -6970,7 +6970,7 @@ trait DatabasesBase
 
         $databaseId = $database['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6987,7 +6987,7 @@ trait DatabasesBase
         $tableId = $table['body']['$id'];
 
         // Add integer attribute
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6999,7 +6999,7 @@ trait DatabasesBase
         \sleep(2);
 
         // Create row with initial count = 10
-        $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -7014,21 +7014,21 @@ trait DatabasesBase
         $rowId = $doc['body']['$id'];
 
         // Decrement by default 1 (count = 10 -> 9)
-        $dec = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
+        $dec = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]));
         $this->assertEquals(200, $dec['headers']['status-code']);
         $this->assertEquals(9, $dec['body']['count']);
 
-        $get = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId, array_merge([
+        $get = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
         $this->assertEquals(9, $get['body']['count']);
 
         // Decrement by custom value 3 (count 9 -> 6)
-        $dec2 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
+        $dec2 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]), [
@@ -7037,28 +7037,28 @@ trait DatabasesBase
         $this->assertEquals(200, $dec2['headers']['status-code']);
         $this->assertEquals(6, $dec2['body']['count']);
 
-        $get2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId, array_merge([
+        $get2 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
         $this->assertEquals(6, $get2['body']['count']);
 
         // Test min limit exceeded
-        $err = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
+        $err = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]), ['min' => 7]);
         $this->assertEquals(400, $err['headers']['status-code']);
 
         // Test type error on non-numeric attribute
-        $typeErr = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
+        $typeErr = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId . '/count/decrement', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]), ['value' => 'not-a-number']);
         $this->assertEquals(400, $typeErr['headers']['status-code']);
 
         // Test decrement with value 0
-        $inc3 = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/grids/tables/$tableId/rows/$rowId/count/decrement", array_merge([
+        $inc3 = $this->client->call(Client::METHOD_PATCH, "/databases/$databaseId/tablesdb/tables/$tableId/rows/$rowId/count/decrement", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]), [
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesConsoleClientTest.php b/tests/e2e/Services/Databases/TablesDB/DatabasesConsoleClientTest.php
similarity index 91%
rename from tests/e2e/Services/Databases/Grids/DatabasesConsoleClientTest.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesConsoleClientTest.php
index 32fe49b6fa..0036f9b7d0 100644
--- a/tests/e2e/Services/Databases/Grids/DatabasesConsoleClientTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesConsoleClientTest.php
@@ -34,7 +34,7 @@ class DatabasesConsoleClientTest extends Scope
         /**
          * Test for SUCCESS
          */
-        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -65,7 +65,7 @@ class DatabasesConsoleClientTest extends Scope
 
         $this->assertFalse($database['body']['enabled']);
 
-        $tvShows = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tvShows = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -83,7 +83,7 @@ class DatabasesConsoleClientTest extends Scope
         /**
          * Test when table is disabled but can still modify tables
          */
-        $database = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $movies['body']['$id'], array_merge([
+        $database = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $movies['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -109,7 +109,7 @@ class DatabasesConsoleClientTest extends Scope
          */
         $databaseId = $data['databaseId'];
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id']
         ], $this->getHeaders()));
@@ -131,7 +131,7 @@ class DatabasesConsoleClientTest extends Scope
         /**
          * Test when database and table are disabled but can still call get table
          */
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $moviesCollectionId, array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesCollectionId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -156,7 +156,7 @@ class DatabasesConsoleClientTest extends Scope
         /**
          * Test When database and table are disabled but can still call update table
          */
-        $table = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $moviesCollectionId, array_merge([
+        $table = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesCollectionId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -184,7 +184,7 @@ class DatabasesConsoleClientTest extends Scope
         /**
          * Test when database and table are disabled but can still call delete table
          */
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tvShowsId, array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tvShowsId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -245,7 +245,7 @@ class DatabasesConsoleClientTest extends Scope
          * Test for FAILURE
          */
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/usage', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/usage', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id']
         ], $this->getHeaders()), [
@@ -254,7 +254,7 @@ class DatabasesConsoleClientTest extends Scope
 
         $this->assertEquals(400, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/randomCollectionId/usage', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/randomCollectionId/usage', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id']
         ], $this->getHeaders()), [
@@ -266,7 +266,7 @@ class DatabasesConsoleClientTest extends Scope
         /**
          * Test for SUCCESS
          */
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/usage', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/usage', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id']
         ], $this->getHeaders()), [
@@ -289,7 +289,7 @@ class DatabasesConsoleClientTest extends Scope
         /**
          * Test for SUCCESS
          */
-        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/logs', array_merge([
+        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -298,7 +298,7 @@ class DatabasesConsoleClientTest extends Scope
         $this->assertIsArray($logs['body']['logs']);
         $this->assertIsNumeric($logs['body']['total']);
 
-        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/logs', array_merge([
+        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -310,7 +310,7 @@ class DatabasesConsoleClientTest extends Scope
         $this->assertLessThanOrEqual(1, count($logs['body']['logs']));
         $this->assertIsNumeric($logs['body']['total']);
 
-        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/logs', array_merge([
+        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -321,7 +321,7 @@ class DatabasesConsoleClientTest extends Scope
         $this->assertIsArray($logs['body']['logs']);
         $this->assertIsNumeric($logs['body']['total']);
 
-        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['moviesId'] . '/logs', array_merge([
+        $logs = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['moviesId'] . '/logs', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesCustomClientTest.php b/tests/e2e/Services/Databases/TablesDB/DatabasesCustomClientTest.php
similarity index 89%
rename from tests/e2e/Services/Databases/Grids/DatabasesCustomClientTest.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesCustomClientTest.php
index f07b648890..b5c70a7c69 100644
--- a/tests/e2e/Services/Databases/Grids/DatabasesCustomClientTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesCustomClientTest.php
@@ -35,7 +35,7 @@ class DatabasesCustomClientTest extends Scope
         $databaseId = $database['body']['$id'];
 
         // Collection aliases write to create, update, delete
-        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -54,7 +54,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertContains(Permission::update(Role::user($this->getUser()['$id'])), $movies['body']['$permissions']);
         $this->assertContains(Permission::delete(Role::user($this->getUser()['$id'])), $movies['body']['$permissions']);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/columns/string', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -69,7 +69,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(202, $response['headers']['status-code']);
 
         // Document aliases write to update, delete
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -91,7 +91,7 @@ class DatabasesCustomClientTest extends Scope
          */
 
         // Document does not allow create permission
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -133,7 +133,7 @@ class DatabasesCustomClientTest extends Scope
 
         $databaseId = $database['body']['$id'];
         // Create collection
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -146,7 +146,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
 
         // Add attribute to collection
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/permissionCheck/columns/string', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/permissionCheck/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -161,7 +161,7 @@ class DatabasesCustomClientTest extends Scope
         sleep(2);
 
         // Creating document by server, give read permission to our user + some other user
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/permissionCheck/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/permissionCheck/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -182,7 +182,7 @@ class DatabasesCustomClientTest extends Scope
 
         // Update document
         // This is the point of this test. We should be allowed to do this action, and it should not fail on permission check
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/permissionCheck/rows/permissionCheckDocument', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/permissionCheck/rows/permissionCheckDocument', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -194,7 +194,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Get name of the document, should be the new one
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/permissionCheck/rows/permissionCheckDocument', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/permissionCheck/rows/permissionCheckDocument', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -203,7 +203,7 @@ class DatabasesCustomClientTest extends Scope
 
         // Cleanup to prevent collision with other tests
         // Delete collection
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/permissionCheck', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/permissionCheck', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -216,7 +216,7 @@ class DatabasesCustomClientTest extends Scope
         sleep(2);
 
         // Make sure collection has been deleted
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/permissionCheck', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/permissionCheck', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -242,7 +242,7 @@ class DatabasesCustomClientTest extends Scope
 
 
         // Creating collection 1
-        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -259,7 +259,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Creating collection 2
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -278,7 +278,7 @@ class DatabasesCustomClientTest extends Scope
         \sleep(2);
 
         // Creating two way relationship between collection 1 and collection 2 from collection 1
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -294,7 +294,7 @@ class DatabasesCustomClientTest extends Scope
         \sleep(3);
 
         // Update relation from collection 2 to on delete restrict
-        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table2['body']['$id'] . '/columns/' . $table1['body']['$id'] . '/relationship', array_merge([
+        $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2['body']['$id'] . '/columns/' . $table1['body']['$id'] . '/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -303,7 +303,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Fetching attributes after updating relation to compare
-        $table1Attributes =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'], [
+        $table1Attributes =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'], [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -330,7 +330,7 @@ class DatabasesCustomClientTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -346,7 +346,7 @@ class DatabasesCustomClientTest extends Scope
             ]
         ]);
 
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -364,7 +364,7 @@ class DatabasesCustomClientTest extends Scope
 
         \sleep(2);
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -382,7 +382,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(202, $relation['headers']['status-code']);
         $this->assertEquals('same_key', $relation['body']['twoWayKey']);
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -401,7 +401,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals('Attribute with the requested key already exists. Attribute keys must be unique, try again with a different key.', $relation['body']['message']);
 
         // twoWayKey is null TwoWayKey is default
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -419,7 +419,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertArrayHasKey('twoWayKey', $relation['body']);
 
         // twoWayKey is null,   TwoWayKey is default, second POST
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -437,7 +437,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(409, $relation['body']['code']);
 
         // RelationshipManyToMany
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -456,7 +456,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertArrayHasKey('twoWayKey', $relation['body']);
 
         // Second RelationshipManyToMany on Same collections
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -490,7 +490,7 @@ class DatabasesCustomClientTest extends Scope
         $databaseId = $database['body']['$id'];
 
         // Creating collection 1
-        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -506,7 +506,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Creating collection 2
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -519,7 +519,7 @@ class DatabasesCustomClientTest extends Scope
             ]
         ]);
 
-        $table3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -534,7 +534,7 @@ class DatabasesCustomClientTest extends Scope
             ]
         ]);
 
-        $table4 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table4 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -547,7 +547,7 @@ class DatabasesCustomClientTest extends Scope
             ]
         ]);
 
-        $table5 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table5 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -563,7 +563,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Creating one to one relationship from collection 1 to colletion 2
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -576,7 +576,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Creating one to one relationship from collection 2 to colletion 3
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table2['body']['$id'] . '/columns/relationship', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -589,7 +589,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Creating one to one relationship from collection 3 to colletion 4
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table3['body']['$id'] . '/columns/relationship', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table3['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -602,7 +602,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Creating one to one relationship from collection 4 to colletion 5
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table4['body']['$id'] . '/columns/relationship', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table4['body']['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -614,7 +614,7 @@ class DatabasesCustomClientTest extends Scope
             'key' => $table5['body']['$id']
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -626,7 +626,7 @@ class DatabasesCustomClientTest extends Scope
             'default' => null,
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table2['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -638,7 +638,7 @@ class DatabasesCustomClientTest extends Scope
             'default' => null,
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table3['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table3['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -650,7 +650,7 @@ class DatabasesCustomClientTest extends Scope
             'default' => null,
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table4['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table4['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -662,7 +662,7 @@ class DatabasesCustomClientTest extends Scope
             'default' => null,
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table5['body']['$id'] . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table5['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -676,7 +676,7 @@ class DatabasesCustomClientTest extends Scope
 
         \sleep(2);
         // Creating parent document with a child reference to test the permissions
-        $parentDocument = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/rows', array_merge([
+        $parentDocument = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -705,7 +705,7 @@ class DatabasesCustomClientTest extends Scope
 
         $this->assertEquals(201, $parentDocument['headers']['status-code']);
         // This is the point of the test. We should not need any authorization permission to update the document with same data.
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -734,7 +734,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals($parentDocument['body'], $response['body']);
 
         // Giving update permission of collection 3 to user.
-        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/collection3', array_merge([
+        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/collection3', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -751,7 +751,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // This is the point of this test. We should be allowed to do this action, and it should not fail on permission check
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -780,7 +780,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(11, $response['body'][$table2['body']['$id']]['collection3']['Rating']);
 
         // We should not be allowed to update the document as we do not have permission for collection 2.
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -797,7 +797,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(401, $response['headers']['status-code']);
 
         // We should not be allowed to update the document as we do not have permission for collection 2.
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table2['body']['$id'] . '/rows/' . $table2['body']['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2['body']['$id'] . '/rows/' . $table2['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -809,7 +809,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(401, $response['headers']['status-code']);
 
         // Removing update permission from collection 3.
-        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/collection3', array_merge([
+        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/collection3', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -825,7 +825,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Giving update permission to collection 2.
-        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/collection2', array_merge([
+        $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/collection2', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -842,7 +842,7 @@ class DatabasesCustomClientTest extends Scope
         ]);
 
         // Creating collection 3 new document
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table3['body']['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table3['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -856,7 +856,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
 
         // We should be allowed to link a new document from collection 3 to collection 2.
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -873,7 +873,7 @@ class DatabasesCustomClientTest extends Scope
 
 
         // We should be allowed to link and create a new document from collection 3 to collection 2.
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1['body']['$id'] . '/rows/' . $table1['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -904,7 +904,7 @@ class DatabasesCustomClientTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -922,7 +922,7 @@ class DatabasesCustomClientTest extends Scope
         $tableId = $table['body']['$id'];
 
         // Create string column
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -935,7 +935,7 @@ class DatabasesCustomClientTest extends Scope
         sleep(1);
 
         // Test 1: Try to create row with $createdAt - should return 400
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -949,7 +949,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // Test 2: Try to create row with $updatedAt - should return 400
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -963,7 +963,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // Test 3: Try to create row with both $createdAt and $updatedAt - should return 400
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -978,7 +978,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // Test 4: Create a valid row first
-        $validRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $validRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -992,7 +992,7 @@ class DatabasesCustomClientTest extends Scope
         $rowId = $validRow['body']['$id'];
 
         // Test 5: Try to update row with $createdAt - should return 400
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId, array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1005,7 +1005,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // Test 6: Try to update row with $updatedAt - should return 400
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId, array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1018,7 +1018,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // Test 7: Try to update row with both $createdAt and $updatedAt - should return 400
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $rowId, array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $rowId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1032,7 +1032,7 @@ class DatabasesCustomClientTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // Cleanup
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/TablesDB/DatabasesCustomServerTest.php
similarity index 88%
rename from tests/e2e/Services/Databases/Grids/DatabasesCustomServerTest.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesCustomServerTest.php
index d2c24ca2f1..6d66b4cc62 100644
--- a/tests/e2e/Services/Databases/Grids/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesCustomServerTest.php
@@ -352,7 +352,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test for SUCCESS
          */
-        $test1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $test1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -368,7 +368,7 @@ class DatabasesCustomServerTest extends Scope
             'rowSecurity' => true,
         ]);
 
-        $test2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $test2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -384,7 +384,7 @@ class DatabasesCustomServerTest extends Scope
             'rowSecurity' => true,
         ]);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -397,7 +397,7 @@ class DatabasesCustomServerTest extends Scope
 
         $base = array_reverse($tables['body']['tables']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -409,7 +409,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $tables['headers']['status-code']);
         $this->assertCount(1, $tables['body']['tables']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -421,7 +421,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $tables['headers']['status-code']);
         $this->assertCount(1, $tables['body']['tables']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -433,7 +433,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $tables['headers']['status-code']);
         $this->assertCount(2, $tables['body']['tables']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -448,7 +448,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test for Order
          */
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -464,12 +464,12 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test for After
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -481,7 +481,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertCount(1, $tables['body']['tables']);
         $this->assertEquals($base['body']['tables'][1]['$id'], $tables['body']['tables'][0]['$id']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -496,12 +496,12 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test for Before
          */
-        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $base = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -513,7 +513,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertCount(1, $tables['body']['tables']);
         $this->assertEquals($base['body']['tables'][0]['$id'], $tables['body']['tables'][0]['$id']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -528,7 +528,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test for Search
          */
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -538,7 +538,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(1, $tables['body']['total']);
         $this->assertEquals('first', $tables['body']['tables'][0]['$id']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -549,7 +549,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('Test 1', $tables['body']['tables'][0]['name']);
         $this->assertEquals('Test 2', $tables['body']['tables'][1]['name']);
 
-        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $tables = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -561,7 +561,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test for FAILURE
          */
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -573,7 +573,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // This table already exists
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -604,7 +604,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -624,7 +624,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $table = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -652,7 +652,7 @@ class DatabasesCustomServerTest extends Scope
          */
 
         // Create table
-        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -675,7 +675,7 @@ class DatabasesCustomServerTest extends Scope
          * Test for creating encrypted columns
          */
 
-        $columnsPath = '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/columns';
+        $columnsPath = '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/columns';
 
         $firstName = $this->client->call(Client::METHOD_POST, $columnsPath . '/string', array_merge([
             'content-type' => 'application/json',
@@ -714,7 +714,7 @@ class DatabasesCustomServerTest extends Scope
         sleep(2);
 
         // Creating row to ensure cache is purged on schema change
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -732,7 +732,7 @@ class DatabasesCustomServerTest extends Scope
         ]);
 
         // Check row to ensure cache is purged on schema change
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/rows/' . $row['body']['$id'], array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -762,7 +762,7 @@ class DatabasesCustomServerTest extends Scope
          */
 
         // Create table
-        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $actors = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -781,7 +781,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $actors['headers']['status-code']);
         $this->assertEquals($actors['body']['name'], 'Actors');
 
-        $firstName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/columns/string', array_merge([
+        $firstName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -791,7 +791,7 @@ class DatabasesCustomServerTest extends Scope
             'required' => true,
         ]);
 
-        $lastName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/columns/string', array_merge([
+        $lastName = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -801,7 +801,7 @@ class DatabasesCustomServerTest extends Scope
             'required' => true,
         ]);
 
-        $unneeded = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/columns/string', array_merge([
+        $unneeded = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -815,7 +815,7 @@ class DatabasesCustomServerTest extends Scope
         sleep(2);
 
         // Creating row to ensure cache is purged on schema change
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -833,7 +833,7 @@ class DatabasesCustomServerTest extends Scope
             ],
         ]);
 
-        $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/indexes', array_merge([
+        $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -848,7 +848,7 @@ class DatabasesCustomServerTest extends Scope
         // Wait for database worker to finish creating index
         sleep(2);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'], array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -866,7 +866,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($table['body']['indexes'][0]['key'], $index['body']['key']);
 
         // Delete column
-        $column = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/columns/' . $unneededId, array_merge([
+        $column = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/columns/' . $unneededId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -877,7 +877,7 @@ class DatabasesCustomServerTest extends Scope
         sleep(2);
 
         // Check row to ensure cache is purged on schema change
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'] . '/rows/' . $row['body']['$id'], array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'] . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -885,7 +885,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertNotContains($unneededId, $row['body']);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $actors['body']['$id'], array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $actors['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -910,7 +910,7 @@ class DatabasesCustomServerTest extends Scope
     public function testDeleteIndex($data): array
     {
         $databaseId = $data['databaseId'];
-        $index = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'] . '/indexes/' . $data['key'], array_merge([
+        $index = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'] . '/indexes/' . $data['key'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -921,7 +921,7 @@ class DatabasesCustomServerTest extends Scope
         // Wait for database worker to finish deleting index
         sleep(2);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'], array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -938,7 +938,7 @@ class DatabasesCustomServerTest extends Scope
     public function testDeleteIndexOnDeleteColumn($data)
     {
         $databaseId = $data['databaseId'];
-        $column1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'] . '/columns/string', array_merge([
+        $column1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -948,7 +948,7 @@ class DatabasesCustomServerTest extends Scope
             'required' => true,
         ]);
 
-        $column2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'] . '/columns/string', array_merge([
+        $column2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'] . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -965,7 +965,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(2);
 
-        $index1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'] . '/indexes', array_merge([
+        $index1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -976,7 +976,7 @@ class DatabasesCustomServerTest extends Scope
             'orders' => ['ASC', 'ASC'],
         ]);
 
-        $index2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'] . '/indexes', array_merge([
+        $index2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'] . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -994,7 +994,7 @@ class DatabasesCustomServerTest extends Scope
         sleep(2);
 
         // Expected behavior: deleting column2 will cause index2 to be dropped, and index1 rebuilt with a single key
-        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'] . '/columns/' . $column2['body']['key'], array_merge([
+        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'] . '/columns/' . $column2['body']['key'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1005,7 +1005,7 @@ class DatabasesCustomServerTest extends Scope
         // wait for database worker to complete
         sleep(2);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'], array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1020,7 +1020,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($column1['body']['key'], $table['body']['indexes'][0]['columns'][0]);
 
         // Delete column
-        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $data['tableId'] . '/columns/' . $column1['body']['key'], array_merge([
+        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['tableId'] . '/columns/' . $column1['body']['key'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1045,7 +1045,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('invalidRowDatabase', $database['body']['name']);
 
         $databaseId = $database['body']['$id'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1066,7 +1066,7 @@ class DatabasesCustomServerTest extends Scope
 
         $tableId = $table['body']['$id'];
 
-        $column1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $column1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1076,7 +1076,7 @@ class DatabasesCustomServerTest extends Scope
             'required' => true,
         ]);
 
-        $column2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $column2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1093,7 +1093,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(2);
 
-        $index1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/indexes', array_merge([
+        $index1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1104,7 +1104,7 @@ class DatabasesCustomServerTest extends Scope
             'orders' => ['ASC', 'ASC'],
         ]);
 
-        $index2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/indexes', array_merge([
+        $index2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1122,7 +1122,7 @@ class DatabasesCustomServerTest extends Scope
         sleep(2);
 
         // Expected behavior: deleting column1 would cause index1 to be a duplicate of index2 and automatically removed
-        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $column1['body']['key'], array_merge([
+        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $column1['body']['key'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1133,7 +1133,7 @@ class DatabasesCustomServerTest extends Scope
         // wait for database worker to complete
         sleep(2);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1148,7 +1148,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($column2['body']['key'], $table['body']['indexes'][0]['columns'][0]);
 
         // Delete column
-        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $column2['body']['key'], array_merge([
+        $deleted = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $column2['body']['key'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1166,7 +1166,7 @@ class DatabasesCustomServerTest extends Scope
         $tableId = $data['tableId'];
 
         // Add Rows to the table
-        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1182,7 +1182,7 @@ class DatabasesCustomServerTest extends Scope
             ],
         ]);
 
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -1211,7 +1211,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('Jackson', $row2['body']['lastName']);
 
         // Delete the actors table
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1221,7 +1221,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($response['body'], "");
 
         // Try to get the table and check if it has been deleted
-        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id']
         ], $this->getHeaders()));
@@ -1244,7 +1244,7 @@ class DatabasesCustomServerTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1255,7 +1255,7 @@ class DatabasesCustomServerTest extends Scope
             'permissions' => [],
         ]);
 
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1269,7 +1269,7 @@ class DatabasesCustomServerTest extends Scope
         $table1 = $table1['body']['$id'];
         $table2 = $table2['body']['$id'];
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1 . '/columns/relationship', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1 . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1282,7 +1282,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(2);
 
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $table2, array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1290,7 +1290,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(2);
 
-        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1 . '/columns', array_merge([
+        $columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1 . '/columns', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey'],
@@ -1313,7 +1313,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('invalidRowDatabase', $database['body']['name']);
 
         $databaseId = $database['body']['$id'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1336,7 +1336,7 @@ class DatabasesCustomServerTest extends Scope
 
         // Add wide string columns to approach row width limit
         for ($i = 0; $i < 15; $i++) {
-            $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+            $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1351,7 +1351,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(5);
 
-        $tooWide = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $tooWide = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1379,7 +1379,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('invalidRowDatabase', $database['body']['name']);
 
         $databaseId = $database['body']['$id'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1403,7 +1403,7 @@ class DatabasesCustomServerTest extends Scope
         // add unique columns for indexing
         for ($i = 0; $i < 64; $i++) {
             // $this->assertEquals(true, static::getDatabase()->createColumn('indexLimit', "test{$i}", Database::VAR_STRING, 16, true));
-            $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+            $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1418,7 +1418,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(10);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1439,7 +1439,7 @@ class DatabasesCustomServerTest extends Scope
         // MariaDB, MySQL, and MongoDB create 6 indexes per new table
         // Add up to the limit, then check if the next index throws IndexLimitException
         for ($i = 0; $i < 58; $i++) {
-            $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/indexes', array_merge([
+            $index = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/indexes', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1455,7 +1455,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(5);
 
-        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1468,7 +1468,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertCount(64, $table['body']['columns']);
         $this->assertCount(58, $table['body']['indexes']);
 
-        $tooMany = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/indexes', array_merge([
+        $tooMany = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1481,7 +1481,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $tooMany['headers']['status-code']);
         $this->assertEquals('Index limit exceeded', $tooMany['body']['message']);
 
-        $table = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $table = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1503,7 +1503,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $database['headers']['status-code']);
 
         $databaseId = $database['body']['$id'];
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1519,7 +1519,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create String Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1534,7 +1534,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create Email Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1548,7 +1548,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create IP Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1562,7 +1562,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create URL Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1576,7 +1576,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create Integer Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1590,7 +1590,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create Float Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1602,7 +1602,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create Boolean Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1614,7 +1614,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create Datetime Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1626,7 +1626,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Create Enum Column
          */
-        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1655,7 +1655,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1666,7 +1666,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1675,7 +1675,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertEquals('lorem', $new['body']['default']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1686,7 +1686,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($column['required']);
         $this->assertEquals('lorem', $column['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1697,7 +1697,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1706,7 +1706,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertNull($new['body']['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1717,7 +1717,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1729,7 +1729,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1741,7 +1741,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1753,7 +1753,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1764,7 +1764,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1775,7 +1775,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1797,7 +1797,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1808,7 +1808,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1817,7 +1817,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertEquals('torsten@appwrite.io', $new['body']['default']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1829,7 +1829,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('torsten@appwrite.io', $column['default']);
 
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1840,7 +1840,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1849,7 +1849,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertNull($new['body']['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1860,7 +1860,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1872,7 +1872,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1884,7 +1884,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1896,7 +1896,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1907,7 +1907,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1918,7 +1918,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/email/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/email/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1940,7 +1940,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1951,7 +1951,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1960,7 +1960,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertEquals('127.0.0.1', $new['body']['default']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1971,7 +1971,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($column['required']);
         $this->assertEquals('127.0.0.1', $column['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1982,7 +1982,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1991,7 +1991,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertNull($new['body']['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2002,7 +2002,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2014,7 +2014,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2026,7 +2026,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2038,7 +2038,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2049,7 +2049,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2060,7 +2060,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/ip/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2082,7 +2082,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2093,7 +2093,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2102,7 +2102,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertEquals('http://appwrite.io', $new['body']['default']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2113,7 +2113,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($column['required']);
         $this->assertEquals('http://appwrite.io', $column['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2124,7 +2124,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2133,7 +2133,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertNull($new['body']['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2144,7 +2144,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2156,7 +2156,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2168,7 +2168,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2180,7 +2180,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2191,7 +2191,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2202,7 +2202,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/url/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/url/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2224,7 +2224,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2237,7 +2237,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2248,7 +2248,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(0, $new['body']['min']);
         $this->assertEquals(1000, $new['body']['max']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2261,7 +2261,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(0, $column['min']);
         $this->assertEquals(1000, $column['max']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2274,7 +2274,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2285,7 +2285,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(0, $new['body']['min']);
         $this->assertEquals(1000, $new['body']['max']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2298,7 +2298,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2309,7 +2309,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(100, $new['body']['min']);
         $this->assertEquals(2000, $new['body']['max']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2321,7 +2321,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2336,7 +2336,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2350,7 +2350,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2364,7 +2364,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2378,7 +2378,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2392,7 +2392,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2405,7 +2405,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2418,7 +2418,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2432,7 +2432,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::COLUMN_DEFAULT_UNSUPPORTED, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2446,7 +2446,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::COLUMN_VALUE_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2461,7 +2461,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(AppwriteException::COLUMN_VALUE_INVALID, $update['body']['type']);
 
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/integer/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2485,7 +2485,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2498,7 +2498,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2509,7 +2509,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(0, $new['body']['min']);
         $this->assertEquals(1000, $new['body']['max']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2522,7 +2522,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(0, $column['min']);
         $this->assertEquals(1000, $column['max']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2535,7 +2535,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2546,7 +2546,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(0, $new['body']['min']);
         $this->assertEquals(1000, $new['body']['max']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2559,7 +2559,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2570,7 +2570,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(123.456, $new['body']['min']);
         $this->assertEquals(2000, $new['body']['max']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2582,7 +2582,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2597,7 +2597,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2611,7 +2611,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2625,7 +2625,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2639,7 +2639,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2653,7 +2653,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2666,7 +2666,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2679,7 +2679,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2693,7 +2693,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::COLUMN_DEFAULT_UNSUPPORTED, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2707,7 +2707,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::COLUMN_VALUE_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2722,7 +2722,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(AppwriteException::COLUMN_VALUE_INVALID, $update['body']['type']);
 
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/float/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/float/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2746,7 +2746,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2757,7 +2757,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2766,7 +2766,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertEquals(true, $new['body']['default']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2777,7 +2777,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($column['required']);
         $this->assertEquals(true, $column['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2788,7 +2788,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2797,7 +2797,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertNull($new['body']['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2808,7 +2808,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2820,7 +2820,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2832,7 +2832,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2844,7 +2844,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2855,7 +2855,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2866,7 +2866,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/boolean/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2888,7 +2888,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2899,7 +2899,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2908,7 +2908,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertEquals('1975-06-12 14:12:55+02:00', $new['body']['default']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2919,7 +2919,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($column['required']);
         $this->assertEquals('1975-06-12 14:12:55+02:00', $column['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2930,7 +2930,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2939,7 +2939,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertFalse($new['body']['required']);
         $this->assertNull($new['body']['default']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2950,7 +2950,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2962,7 +2962,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2974,7 +2974,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2986,7 +2986,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2997,7 +2997,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3008,7 +3008,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3030,7 +3030,7 @@ class DatabasesCustomServerTest extends Scope
         $databaseId = $data['databaseId'];
         $tableId = $data['tableId'];
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3042,7 +3042,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3055,7 +3055,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertContains('ipsum', $new['body']['elements']);
         $this->assertContains('dolor', $new['body']['elements']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3070,7 +3070,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertContains('ipsum', $column['elements']);
         $this->assertContains('dolor', $column['elements']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3082,7 +3082,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3095,7 +3095,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertContains('ipsum', $new['body']['elements']);
         $this->assertContains('dolor', $new['body']['elements']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3107,7 +3107,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(200, $update['headers']['status-code']);
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3122,7 +3122,7 @@ class DatabasesCustomServerTest extends Scope
         /**
          * Test against failure
          */
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3135,7 +3135,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::COLUMN_VALUE_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3148,7 +3148,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::COLUMN_VALUE_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3161,7 +3161,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3174,7 +3174,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3187,7 +3187,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3199,7 +3199,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3211,7 +3211,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3223,7 +3223,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $update['headers']['status-code']);
         $this->assertEquals(AppwriteException::GENERAL_ARGUMENT_INVALID, $update['body']['type']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/enum/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3248,7 +3248,7 @@ class DatabasesCustomServerTest extends Scope
 
         $row = $this->client->call(
             Client::METHOD_POST,
-            '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -3264,7 +3264,7 @@ class DatabasesCustomServerTest extends Scope
         );
 
         // Test Resize Up
-        $column = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $column = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3280,7 +3280,7 @@ class DatabasesCustomServerTest extends Scope
         // Test create new row with new size
         $newDoc = $this->client->call(
             Client::METHOD_POST,
-            '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -3299,7 +3299,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(2048, strlen($newDoc['body']['string']));
 
         // Test update row with new size
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3313,7 +3313,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(2048, strlen($row['body']['string']));
 
         // Test Exception on resize down with data that is too large
-        $column = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $column = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3327,7 +3327,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(AppwriteException::COLUMN_INVALID_RESIZE, $column['body']['type']);
 
         // original rows to original size, remove new row
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3340,7 +3340,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $row['headers']['status-code']);
         $this->assertEquals('string', $row['body']['string']);
 
-        $deleteDoc = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $newDoc['body']['$id'], array_merge([
+        $deleteDoc = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $newDoc['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3350,7 +3350,7 @@ class DatabasesCustomServerTest extends Scope
 
 
         // Test Resize Down
-        $column = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $column = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3366,7 +3366,7 @@ class DatabasesCustomServerTest extends Scope
         // Test create new row with new size
         $newDoc = $this->client->call(
             Client::METHOD_POST,
-            '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -3385,7 +3385,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(10, strlen($newDoc['body']['string']));
 
         // Test update row with new size
-        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
+        $row = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3401,7 +3401,7 @@ class DatabasesCustomServerTest extends Scope
         // Try create row with string that is too large
         $newDoc = $this->client->call(
             Client::METHOD_POST,
-            '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -3472,7 +3472,7 @@ class DatabasesCustomServerTest extends Scope
             /**
              * Check if Database exists
              */
-            $update = $this->client->call(Client::METHOD_PATCH, '/databases/i_dont_exist/grids/tables/' . $tableId . '/columns/' . $key . '/unknown_' . $key, array_merge([
+            $update = $this->client->call(Client::METHOD_PATCH, '/databases/i_dont_exist/tablesdb/tables/' . $tableId . '/columns/' . $key . '/unknown_' . $key, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3484,7 +3484,7 @@ class DatabasesCustomServerTest extends Scope
             /**
              * Check if Table exists
              */
-            $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/i_dont_exist/columns/' . $key . '/unknown_' . $key, array_merge([
+            $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/i_dont_exist/columns/' . $key . '/unknown_' . $key, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3496,7 +3496,7 @@ class DatabasesCustomServerTest extends Scope
             /**
              * Check if Column exists
              */
-            $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key . '/unknown_' . $key, array_merge([
+            $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key . '/unknown_' . $key, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3519,7 +3519,7 @@ class DatabasesCustomServerTest extends Scope
         // Create row to test against
         $row = $this->client->call(
             Client::METHOD_POST,
-            '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -3536,7 +3536,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(201, $row['headers']['status-code']);
 
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string/' . $key, array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3550,7 +3550,7 @@ class DatabasesCustomServerTest extends Scope
 
         $key = 'new_string';
 
-        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/' . $key, array_merge([
+        $new = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/' . $key, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3558,7 +3558,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals('new_string', $new['body']['key']);
 
-        $doc1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
+        $doc1 = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $row['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3571,7 +3571,7 @@ class DatabasesCustomServerTest extends Scope
         // Try and create a new row with the new column
         $doc2 = $this->client->call(
             Client::METHOD_POST,
-            '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -3593,7 +3593,7 @@ class DatabasesCustomServerTest extends Scope
         // Expect fail, try and create a new row with the old column
         $doc3 = $this->client->call(
             Client::METHOD_POST,
-            '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows',
+            '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows',
             array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
@@ -3625,7 +3625,7 @@ class DatabasesCustomServerTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3641,7 +3641,7 @@ class DatabasesCustomServerTest extends Scope
             ]
         ]);
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3679,7 +3679,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->createRelationshipTables();
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3694,7 +3694,7 @@ class DatabasesCustomServerTest extends Scope
 
         \sleep(3);
 
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3707,7 +3707,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($relation['body']['relatedTable'], $table1RelationColumn['relatedTable']);
 
         // Create a row for checking later
-        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows', array_merge([
+        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3725,7 +3725,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $originalRow['headers']['status-code']);
 
         // Rename the column
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3736,7 +3736,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $update['headers']['status-code']);
 
         // Check the row's key has been renamed
-        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
+        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3751,7 +3751,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertArrayNotHasKey('level2', $newRow['body']);
 
         // Check level2 row has been renamed
-        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2'][0]['$id'], array_merge([
+        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2'][0]['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3761,7 +3761,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEmpty($level2Row['body']['level1']);
 
         // Check if column was renamed on the parent's side
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3772,7 +3772,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('new_level_2', $table1Columns['body']['columns'][0]['key']);
 
         // Check if column was renamed on the child's side
-        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id, [
+        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3793,7 +3793,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->createRelationshipTables();
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3808,7 +3808,7 @@ class DatabasesCustomServerTest extends Scope
 
         \sleep(3);
 
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3821,7 +3821,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($relation['body']['relatedTable'], $table1RelationColumn['relatedTable']);
 
         // Create a row for checking later
-        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows', array_merge([
+        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3839,7 +3839,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $originalRow['headers']['status-code']);
 
         // Rename the column
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3850,7 +3850,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $update['headers']['status-code']);
 
         // Check the row's key has been renamed
-        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
+        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3865,7 +3865,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertArrayNotHasKey('level2', $newRow['body']);
 
         // Check level2 row has been renamed
-        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2']['$id'], array_merge([
+        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3875,7 +3875,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEmpty($level2Row['body']['level1']);
 
         // Check if column was renamed on the parent's side
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3886,7 +3886,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('new_level_2', $table1Columns['body']['columns'][0]['key']);
 
         // Check if column was renamed on the child's side
-        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id, [
+        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3907,7 +3907,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->createRelationshipTables();
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3922,7 +3922,7 @@ class DatabasesCustomServerTest extends Scope
 
         \sleep(3);
 
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3935,7 +3935,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($relation['body']['relatedTable'], $table1RelationColumn['relatedTable']);
 
         // Create a row for checking later
-        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows', array_merge([
+        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3953,7 +3953,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $originalRow['headers']['status-code']);
 
         // Rename the column
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3964,7 +3964,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $update['headers']['status-code']);
 
         // Check the row's key has been renamed
-        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
+        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3979,7 +3979,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertArrayNotHasKey('level2', $newRow['body']);
 
         // Check level2 row has been renamed
-        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2']['$id'], array_merge([
+        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3993,7 +3993,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEmpty($level2Row['body']['level1']);
 
         // Check if column was renamed on the parent's side
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4004,7 +4004,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('new_level_2', $table1Columns['body']['columns'][0]['key']);
 
         // Check if column was renamed on the child's side
-        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id, [
+        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4025,7 +4025,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->createRelationshipTables();
 
-        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/relationship', array_merge([
+        $relation = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4040,7 +4040,7 @@ class DatabasesCustomServerTest extends Scope
 
         \sleep(3);
 
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4053,7 +4053,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($relation['body']['relatedTable'], $table1RelationColumn['relatedTable']);
 
         // Create a row for checking later
-        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows', array_merge([
+        $originalRow = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4071,7 +4071,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $originalRow['headers']['status-code']);
 
         // Rename the column
-        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/columns/level2' . '/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4082,7 +4082,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $update['headers']['status-code']);
 
         // Check the row's key has been renamed
-        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
+        $newRow = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id . '/rows/' . $originalRow['body']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4097,7 +4097,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertArrayNotHasKey('level2', $newRow['body']);
 
         // Check level2 row has been renamed
-        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2']['$id'], array_merge([
+        $level2Row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id . '/rows/' . $newRow['body']['new_level_2']['$id'], array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4111,7 +4111,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEmpty($level2Row['body']['level1']);
 
         // Check if column was renamed on the parent's side
-        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table1Id, [
+        $table1Columns =  $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table1Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4122,7 +4122,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals('new_level_2', $table1Columns['body']['columns'][0]['key']);
 
         // Check if column was renamed on the child's side
-        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $table2Id, [
+        $table2Columns = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $table2Id, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4151,7 +4151,7 @@ class DatabasesCustomServerTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4175,7 +4175,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Await column
-        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/integer', array_merge([
+        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4188,7 +4188,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(1);
 
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4211,7 +4211,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
         $this->assertCount(3, $response['body']['rows']);
 
-        $response = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4224,7 +4224,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertCount(3, $response['body']['rows']);
 
         // TEST SUCCESS - $id is auto-assigned if not included in bulk rows
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4238,7 +4238,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
 
         // TEST FAIL - Can't use data and row together
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4256,7 +4256,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // TEST FAIL - Can't use $rowId and create bulk rows
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4272,7 +4272,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // TEST FAIL - Can't include invalid ID in bulk rows
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4287,7 +4287,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // TEST FAIL - Can't miss number in bulk rows
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4305,7 +4305,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // TEST FAIL - Can't push more than APP_LIMIT_DATABASE_BATCH rows
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4318,7 +4318,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(400, $response['headers']['status-code']);
 
         // TEST FAIL - Can't include invalid permissions in nested rows
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4332,7 +4332,7 @@ class DatabasesCustomServerTest extends Scope
         ]);
 
         // TEST FAIL - Can't bulk create in a table with relationships
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4343,7 +4343,7 @@ class DatabasesCustomServerTest extends Scope
             'permissions' => [],
         ]);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/relationship', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4360,7 +4360,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(1);
 
-        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/grids/tables/{$data['$id']}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/databases/{$databaseId}/tablesdb/tables/{$data['$id']}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4389,7 +4389,7 @@ class DatabasesCustomServerTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4413,7 +4413,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Await column
-        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/integer', array_merge([
+        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4438,7 +4438,7 @@ class DatabasesCustomServerTest extends Scope
                 ];
             }
 
-            $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+            $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()), [
@@ -4459,7 +4459,7 @@ class DatabasesCustomServerTest extends Scope
         sleep(5);
 
         // TEST: Update all rows
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4484,7 +4484,7 @@ class DatabasesCustomServerTest extends Scope
          */
         sleep(5);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4511,7 +4511,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         // TEST: Check permissions persist
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4523,7 +4523,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertCount(10, $response['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4542,7 +4542,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         // TEST: Update rows with limit
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4557,7 +4557,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertCount(5, $response['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4568,7 +4568,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(5, $rows['body']['total']);
 
         // TEST: Update rows with offset
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4583,7 +4583,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertCount(5, $response['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4594,7 +4594,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(10, $rows['body']['total']);
 
         // TEST: Update rows with equals filter
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4609,7 +4609,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertCount(10, $response['body']['rows']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4620,7 +4620,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(10, $rows['body']['total']);
 
         // TEST: Fail - Can't bulk update in a table with relationships
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4631,7 +4631,7 @@ class DatabasesCustomServerTest extends Scope
             'permissions' => [],
         ]);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/relationship', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4648,7 +4648,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(1);
 
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4679,7 +4679,7 @@ class DatabasesCustomServerTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4703,7 +4703,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Await column
-        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/integer', array_merge([
+        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4728,7 +4728,7 @@ class DatabasesCustomServerTest extends Scope
                 ];
             }
 
-            $response = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+            $response = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()), [
@@ -4749,7 +4749,7 @@ class DatabasesCustomServerTest extends Scope
         $rows[] = ['number' => 11];
 
         // TEST: Upsert all rows
-        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4762,7 +4762,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(1000, $response['body']['rows'][0]['number']);
         $this->assertEquals(11, $response['body']['rows'][1]['number']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]));
@@ -4783,7 +4783,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         // TEST: Upsert permissions
-        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4813,7 +4813,7 @@ class DatabasesCustomServerTest extends Scope
         ], $response['body']['rows'][1]['$permissions']);
 
         // TEST: Fail - Can't bulk upsert in a table with relationships
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4824,7 +4824,7 @@ class DatabasesCustomServerTest extends Scope
             'permissions' => [],
         ]);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/relationship', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4841,7 +4841,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(1);
 
-        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4872,7 +4872,7 @@ class DatabasesCustomServerTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4895,7 +4895,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Await column
-        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/integer', array_merge([
+        $numberColumn = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -4920,7 +4920,7 @@ class DatabasesCustomServerTest extends Scope
                 ];
             }
 
-            $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+            $doc = $this->client->call(Client::METHOD_POST, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()), [
@@ -4932,7 +4932,7 @@ class DatabasesCustomServerTest extends Scope
 
         $createBulkRows();
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4941,7 +4941,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(11, $rows['body']['total']);
 
         // TEST: Delete all rows
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4949,7 +4949,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(11, $response['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4960,7 +4960,7 @@ class DatabasesCustomServerTest extends Scope
         // TEST: Delete rows with query
         $createBulkRows();
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4968,7 +4968,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(11, $rows['body']['total']);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -4980,7 +4980,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(5, $response['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -4993,7 +4993,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         // Cleanup
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5004,7 +5004,7 @@ class DatabasesCustomServerTest extends Scope
         // SUCCESS: Delete rows with query
         $createBulkRows();
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5012,7 +5012,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(11, $rows['body']['total']);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5024,7 +5024,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(5, $response['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5033,7 +5033,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(6, $rows['body']['total']);
 
         // Cleanup
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5044,7 +5044,7 @@ class DatabasesCustomServerTest extends Scope
         // SUCCESS: Delete Rows with limit query
         $createBulkRows();
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5052,7 +5052,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(11, $rows['body']['total']);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5064,7 +5064,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(2, $response['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5073,7 +5073,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(9, $rows['body']['total']);
 
         // Cleanup
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5084,7 +5084,7 @@ class DatabasesCustomServerTest extends Scope
         // SUCCESS: Delete Rows with offset query
         $createBulkRows();
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5092,7 +5092,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(11, $rows['body']['total']);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -5104,7 +5104,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(6, $response['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5118,7 +5118,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(4, $lastDoc['number']);
 
         // Cleanup
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5129,7 +5129,7 @@ class DatabasesCustomServerTest extends Scope
         // SUCCESS: Delete 100 rows
         $createBulkRows(100);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5137,7 +5137,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $rows['headers']['status-code']);
         $this->assertEquals(100, $rows['body']['total']);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5145,7 +5145,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals(100, $response['body']['total']);
 
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5154,7 +5154,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(0, $rows['body']['total']);
 
         // TEST: Fail - Can't bulk delete in a table with relationships
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5165,7 +5165,7 @@ class DatabasesCustomServerTest extends Scope
             'permissions' => [],
         ]);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $data['$id'] . '/columns/relationship', array_merge([
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $data['$id'] . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5182,7 +5182,7 @@ class DatabasesCustomServerTest extends Scope
 
         sleep(1);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/grids/tables/' . $data['$id'] . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/databases/' . $data['databaseId'] . '/tablesdb/tables/' . $data['$id'] . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5204,7 +5204,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $databaseId['headers']['status-code']);
         $databaseId = $databaseId['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5219,7 +5219,7 @@ class DatabasesCustomServerTest extends Scope
         $tableId = $table['body']['$id'];
 
         // Create string column
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5230,7 +5230,7 @@ class DatabasesCustomServerTest extends Scope
         ]);
 
         // Create datetime column
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/datetime', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/datetime', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5245,7 +5245,7 @@ class DatabasesCustomServerTest extends Scope
         $date = '2000-01-01T10:00:00.000+00:00';
 
         // Test - default behaviour of external datetime column not changed
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5266,7 +5266,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEmpty($row['body']['$createdAt']);
         $this->assertNotEmpty($row['body']['$updatedAt']);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row1', array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row1', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5277,7 +5277,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEmpty($row['body']['$updatedAt']);
 
         // Test - modifying $createdAt and $updatedAt
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5298,7 +5298,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEmpty($row['body']['$updatedAt']);
         $this->assertNotEquals($row['body']['$updatedAt'], $date);
 
-        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row2', array_merge([
+        $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row2', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -5309,7 +5309,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEquals($row['body']['$updatedAt'], $date);
 
         // Cleanup
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5336,7 +5336,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $databaseId['headers']['status-code']);
         $databaseId = $databaseId['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5351,7 +5351,7 @@ class DatabasesCustomServerTest extends Scope
         $tableId = $table['body']['$id'];
 
         // Create string column
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5370,7 +5370,7 @@ class DatabasesCustomServerTest extends Scope
         $date3 = '2000-03-01T20:45:00.000+00:00';
 
         // Test 1: Create with custom createdAt, then update with custom updatedAt
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5392,7 +5392,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEquals($createDate, $row['body']['$updatedAt']);
 
         // Update with custom updatedAt
-        $updatedRow = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row1', array_merge([
+        $updatedRow = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row1', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5408,7 +5408,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($updateDate, $updatedRow['body']['$updatedAt']);
 
         // Test 2: Create with both custom dates
-        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5431,7 +5431,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($updateDate, $row2['body']['$updatedAt']);
 
         // Test 3: Create without dates, then update with custom dates
-        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row3 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5449,7 +5449,7 @@ class DatabasesCustomServerTest extends Scope
 
         $this->assertEquals(201, $row3['headers']['status-code']);
 
-        $updatedRow3 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row3', array_merge([
+        $updatedRow3 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row3', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5466,7 +5466,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($updateDate, $updatedRow3['body']['$updatedAt']);
 
         // Test 4: Update only createdAt
-        $row4 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row4 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5486,7 +5486,7 @@ class DatabasesCustomServerTest extends Scope
         $originalCreatedAt4 = $row4['body']['$createdAt'];
         $originalUpdatedAt4 = $row4['body']['$updatedAt'];
 
-        $updatedRow4 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row4', array_merge([
+        $updatedRow4 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row4', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5503,7 +5503,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEquals($originalUpdatedAt4, $updatedRow4['body']['$updatedAt']);
 
         // Test 5: Update only updatedAt
-        $finalRow4 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row4', array_merge([
+        $finalRow4 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row4', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5520,7 +5520,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($updateDate, $finalRow4['body']['$updatedAt']);
 
         // Test 6: Create with updatedAt, update with createdAt
-        $row5 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row5 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5541,7 +5541,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEquals($date2, $row5['body']['$createdAt']);
         $this->assertEquals($date2, $row5['body']['$updatedAt']);
 
-        $updatedRow5 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row5', array_merge([
+        $updatedRow5 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row5', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5557,7 +5557,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEquals($date2, $updatedRow5['body']['$updatedAt']);
 
         // Test 7: Create with both dates, update with different dates
-        $row6 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $row6 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5579,7 +5579,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($date1, $row6['body']['$createdAt']);
         $this->assertEquals($date2, $row6['body']['$updatedAt']);
 
-        $updatedRow6 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/row6', array_merge([
+        $updatedRow6 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/row6', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5596,7 +5596,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($date3, $updatedRow6['body']['$updatedAt']);
 
         // Cleanup
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5623,7 +5623,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $databaseId['headers']['status-code']);
         $databaseId = $databaseId['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5638,7 +5638,7 @@ class DatabasesCustomServerTest extends Scope
         $tableId = $table['body']['$id'];
 
         // Create string column
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5718,7 +5718,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Create all rows in one bulk operation
-        $bulkCreateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $bulkCreateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5731,7 +5731,7 @@ class DatabasesCustomServerTest extends Scope
 
         // Verify initial state
         foreach (['row1', 'row3'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -5741,7 +5741,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         foreach (['row2', 'row3'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -5751,7 +5751,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         foreach (['row4', 'row5', 'row6'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -5776,7 +5776,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Use bulk update instead of individual updates
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5786,7 +5786,7 @@ class DatabasesCustomServerTest extends Scope
 
         // Verify updated state
         foreach (['row1', 'row3'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -5798,7 +5798,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         foreach (['row2', 'row4', 'row5', 'row6'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -5818,7 +5818,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Use bulk update instead of individual updates
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5829,7 +5829,7 @@ class DatabasesCustomServerTest extends Scope
 
         // Verify final state
         foreach (['row1', 'row2', 'row3', 'row4', 'row5', 'row6'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -5841,7 +5841,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         // Cleanup
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5868,7 +5868,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals(201, $databaseId['headers']['status-code']);
         $databaseId = $databaseId['body']['$id'];
 
-        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', array_merge([
+        $table = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5883,7 +5883,7 @@ class DatabasesCustomServerTest extends Scope
         $tableId = $table['body']['$id'];
 
         // Create string column
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5902,7 +5902,7 @@ class DatabasesCustomServerTest extends Scope
         $date3 = '2000-03-01T20:45:00.000+00:00';
 
         // Test 1: Upsert new row with custom createdAt
-        $upsertRow1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $upsertRow1 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5924,7 +5924,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertNotEquals($createDate, $upsertRow1['body']['$updatedAt']);
 
         // Test 2: Upsert existing row with custom updatedAt
-        $updatedUpsertRow1 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/upsert1', array_merge([
+        $updatedUpsertRow1 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/upsert1', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5940,7 +5940,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($updateDate, $updatedUpsertRow1['body']['$updatedAt']);
 
         // Test 3: Upsert new row with both custom dates
-        $upsertRow2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $upsertRow2 = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -5963,7 +5963,7 @@ class DatabasesCustomServerTest extends Scope
         $this->assertEquals($updateDate, $upsertRow2['body']['$updatedAt']);
 
         // Test 4: Upsert existing row with different dates
-        $updatedUpsertRow2 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/upsert2', array_merge([
+        $updatedUpsertRow2 = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/upsert2', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6009,7 +6009,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Create rows using bulk upsert
-        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PUT, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6021,7 +6021,7 @@ class DatabasesCustomServerTest extends Scope
 
         // Test 7: Verify initial bulk upsert state
         foreach (['bulk_upsert1', 'bulk_upsert3'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -6031,7 +6031,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         foreach (['bulk_upsert2', 'bulk_upsert3'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -6041,7 +6041,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         foreach (['bulk_upsert4'] as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -6065,7 +6065,7 @@ class DatabasesCustomServerTest extends Scope
         $upsertIds = ['bulk_upsert1', 'bulk_upsert2', 'bulk_upsert3', 'bulk_upsert4'];
 
         // Use bulk update instead of individual updates
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6076,7 +6076,7 @@ class DatabasesCustomServerTest extends Scope
 
         // Verify updated state
         foreach ($upsertIds as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -6098,7 +6098,7 @@ class DatabasesCustomServerTest extends Scope
         ];
 
         // Use bulk update instead of individual updates
-        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -6109,7 +6109,7 @@ class DatabasesCustomServerTest extends Scope
 
         // Verify null handling
         foreach ($upsertIds as $id) {
-            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tableId . '/rows/' . $id, array_merge([
+            $row = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId . '/rows/' . $id, array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -6120,7 +6120,7 @@ class DatabasesCustomServerTest extends Scope
         }
 
         // Cleanup
-        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $tableId, array_merge([
+        $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $tableId, array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesPermissionsGuestTest.php b/tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsGuestTest.php
similarity index 85%
rename from tests/e2e/Services/Databases/Grids/DatabasesPermissionsGuestTest.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsGuestTest.php
index c0c3cdae0b..cb0ef346ad 100644
--- a/tests/e2e/Services/Databases/Grids/DatabasesPermissionsGuestTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsGuestTest.php
@@ -31,7 +31,7 @@ class DatabasesPermissionsGuestTest extends Scope
         $this->assertEquals('InvalidRowDatabase', $database['body']['name']);
 
         $databaseId = $database['body']['$id'];
-        $publicMovies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', $this->getServerHeader(), [
+        $publicMovies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::unique(),
             'name' => 'Movies',
             'permissions' => [
@@ -41,7 +41,7 @@ class DatabasesPermissionsGuestTest extends Scope
                 Permission::delete(Role::any()),
             ],
         ]);
-        $privateMovies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', $this->getServerHeader(), [
+        $privateMovies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::unique(),
             'name' => 'Movies',
             'permissions' => [],
@@ -51,12 +51,12 @@ class DatabasesPermissionsGuestTest extends Scope
         $publicTable = ['id' => $publicMovies['body']['$id']];
         $privateTable = ['id' => $privateMovies['body']['$id']];
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $publicTable['id'] . '/columns/string', $this->getServerHeader(), [
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $publicTable['id'] . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
         ]);
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $privateTable['id'] . '/columns/string', $this->getServerHeader(), [
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $privateTable['id'] . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
@@ -93,14 +93,14 @@ class DatabasesPermissionsGuestTest extends Scope
         $privateTableId = $data['privateTableId'];
         $databaseId = $data['databaseId'];
 
-        $publicResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $publicTableId . '/rows', $this->getServerHeader(), [
+        $publicResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $publicTableId . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Lorem',
             ],
             'permissions' => $permissions,
         ]);
-        $privateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $privateTableId . '/rows', $this->getServerHeader(), [
+        $privateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $privateTableId . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Lorem',
@@ -114,11 +114,11 @@ class DatabasesPermissionsGuestTest extends Scope
         $roles = Authorization::getRoles();
         Authorization::cleanRoles();
 
-        $publicRows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $publicTableId  . '/rows', [
+        $publicRows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $publicTableId  . '/rows', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]);
-        $privateRows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $privateTableId  . '/rows', [
+        $privateRows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $privateTableId  . '/rows', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]);
@@ -148,7 +148,7 @@ class DatabasesPermissionsGuestTest extends Scope
         $roles = Authorization::getRoles();
         Authorization::cleanRoles();
 
-        $publicResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $publicTableId . '/rows', [
+        $publicResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $publicTableId . '/rows', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], [
@@ -161,7 +161,7 @@ class DatabasesPermissionsGuestTest extends Scope
         $publicRowId = $publicResponse['body']['$id'];
         $this->assertEquals(201, $publicResponse['headers']['status-code']);
 
-        $privateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $privateTableId . '/rows', [
+        $privateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $privateTableId . '/rows', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], [
@@ -174,7 +174,7 @@ class DatabasesPermissionsGuestTest extends Scope
         $this->assertEquals(401, $privateResponse['headers']['status-code']);
 
         // Create a row in private collection with API key so we can test that update and delete are also not allowed
-        $privateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $privateTableId . '/rows', $this->getServerHeader(), [
+        $privateResponse = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $privateTableId . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Lorem',
@@ -184,7 +184,7 @@ class DatabasesPermissionsGuestTest extends Scope
         $this->assertEquals(201, $privateResponse['headers']['status-code']);
         $privateRowId = $privateResponse['body']['$id'];
 
-        $publicRow = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $publicTableId . '/rows/' . $publicRowId, [
+        $publicRow = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $publicTableId . '/rows/' . $publicRowId, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], [
@@ -196,7 +196,7 @@ class DatabasesPermissionsGuestTest extends Scope
         $this->assertEquals(200, $publicRow['headers']['status-code']);
         $this->assertEquals('Thor: Ragnarok', $publicRow['body']['title']);
 
-        $privateRow = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/grids/tables/' . $privateTableId . '/rows/' . $privateRowId, [
+        $privateRow = $this->client->call(Client::METHOD_PATCH, '/databases/' . $databaseId . '/tablesdb/tables/' . $privateTableId . '/rows/' . $privateRowId, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], [
@@ -207,14 +207,14 @@ class DatabasesPermissionsGuestTest extends Scope
 
         $this->assertEquals(401, $privateRow['headers']['status-code']);
 
-        $publicRow = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $publicTableId . '/rows/' . $publicRowId, [
+        $publicRow = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $publicTableId . '/rows/' . $publicRowId, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]);
 
         $this->assertEquals(204, $publicRow['headers']['status-code']);
 
-        $privateRow = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/grids/tables/' . $privateTableId . '/rows/' . $privateRowId, [
+        $privateRow = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/tablesdb/tables/' . $privateTableId . '/rows/' . $privateRowId, [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ]);
@@ -240,7 +240,7 @@ class DatabasesPermissionsGuestTest extends Scope
         $this->assertEquals('GuestPermissionsWrite', $database['body']['name']);
 
         $databaseId = $database['body']['$id'];
-        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', $this->getServerHeader(), [
+        $movies = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::unique(),
             'name' => 'Movies',
             'permissions' => [
@@ -251,7 +251,7 @@ class DatabasesPermissionsGuestTest extends Scope
 
         $moviesId = $movies['body']['$id'];
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/columns/string', $this->getServerHeader(), [
+        $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
@@ -259,7 +259,7 @@ class DatabasesPermissionsGuestTest extends Scope
 
         sleep(1);
 
-        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $moviesId . '/rows', [
+        $row = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $moviesId . '/rows', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], [
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesPermissionsMemberTest.php b/tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsMemberTest.php
similarity index 89%
rename from tests/e2e/Services/Databases/Grids/DatabasesPermissionsMemberTest.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsMemberTest.php
index 397f82db41..5a4c02793e 100644
--- a/tests/e2e/Services/Databases/Grids/DatabasesPermissionsMemberTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsMemberTest.php
@@ -124,7 +124,7 @@ class DatabasesPermissionsMemberTest extends Scope
 
         $databaseId = $db['body']['$id'];
 
-        $public = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', $this->getServerHeader(), [
+        $public = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::unique(),
             'name' => 'Movies',
             'permissions' => [
@@ -138,14 +138,14 @@ class DatabasesPermissionsMemberTest extends Scope
         $this->assertEquals(201, $public['headers']['status-code']);
         $this->tables = ['public' => $public['body']['$id']];
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $this->tables['public'] . '/columns/string', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $this->tables['public'] . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
         ]);
         $this->assertEquals(202, $response['headers']['status-code']);
 
-        $private = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', $this->getServerHeader(), [
+        $private = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::unique(),
             'name' => 'Private Movies',
             'permissions' => [
@@ -159,14 +159,14 @@ class DatabasesPermissionsMemberTest extends Scope
         $this->assertEquals(201, $private['headers']['status-code']);
         $this->tables['private'] = $private['body']['$id'];
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $this->tables['private'] . '/columns/string', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $this->tables['private'] . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
         ]);
         $this->assertEquals(202, $response['headers']['status-code']);
 
-        $doconly = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables', $this->getServerHeader(), [
+        $doconly = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::unique(),
             'name' => 'Row Only Movies',
             'permissions' => [],
@@ -175,7 +175,7 @@ class DatabasesPermissionsMemberTest extends Scope
         $this->assertEquals(201, $private['headers']['status-code']);
         $this->tables['doconly'] = $doconly['body']['$id'];
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $this->tables['doconly'] . '/columns/string', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $this->tables['doconly'] . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
@@ -202,7 +202,7 @@ class DatabasesPermissionsMemberTest extends Scope
         $tables = $data['tables'];
         $databaseId = $data['databaseId'];
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tables['public'] . '/rows', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tables['public'] . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Lorem',
@@ -211,7 +211,7 @@ class DatabasesPermissionsMemberTest extends Scope
         ]);
         $this->assertEquals(201, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tables['private'] . '/rows', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tables['private'] . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Lorem',
@@ -220,7 +220,7 @@ class DatabasesPermissionsMemberTest extends Scope
         ]);
         $this->assertEquals(201, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/grids/tables/' . $tables['doconly'] . '/rows', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/tablesdb/tables/' . $tables['doconly'] . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Lorem',
@@ -232,7 +232,7 @@ class DatabasesPermissionsMemberTest extends Scope
         /**
          * Check "any" permission table
          */
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tables['public'] . '/rows', [
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tables['public'] . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -245,7 +245,7 @@ class DatabasesPermissionsMemberTest extends Scope
         /**
          * Check "users" permission table
          */
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tables['private'] . '/rows', [
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tables['private'] . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -258,7 +258,7 @@ class DatabasesPermissionsMemberTest extends Scope
         /**
          * Check "user:user1" row only permission table
          */
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/grids/tables/' . $tables['doconly'] . '/rows', [
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/tablesdb/tables/' . $tables['doconly'] . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesPermissionsScope.php b/tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsScope.php
similarity index 100%
rename from tests/e2e/Services/Databases/Grids/DatabasesPermissionsScope.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsScope.php
diff --git a/tests/e2e/Services/Databases/Grids/DatabasesPermissionsTeamTest.php b/tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsTeamTest.php
similarity index 89%
rename from tests/e2e/Services/Databases/Grids/DatabasesPermissionsTeamTest.php
rename to tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsTeamTest.php
index 95abfbc4fe..027d90e2bf 100644
--- a/tests/e2e/Services/Databases/Grids/DatabasesPermissionsTeamTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/DatabasesPermissionsTeamTest.php
@@ -44,7 +44,7 @@ class DatabasesPermissionsTeamTest extends Scope
         ]);
         $this->assertEquals(201, $db['headers']['status-code']);
 
-        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/grids/tables', $this->getServerHeader(), [
+        $table1 = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::custom('table1'),
             'name' => 'Table 1',
             'permissions' => [
@@ -57,13 +57,13 @@ class DatabasesPermissionsTeamTest extends Scope
 
         $this->tables['table1'] = $table1['body']['$id'];
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/grids/tables/' . $this->tables['table1'] . '/columns/string', $this->getServerHeader(), [
+        $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/tablesdb/tables/' . $this->tables['table1'] . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
         ]);
 
-        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/grids/tables', $this->getServerHeader(), [
+        $table2 = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/tablesdb/tables', $this->getServerHeader(), [
             'tableId' => ID::custom('table2'),
             'name' => 'Table 2',
             'permissions' => [
@@ -76,7 +76,7 @@ class DatabasesPermissionsTeamTest extends Scope
 
         $this->tables['table2'] = $table2['body']['$id'];
 
-        $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/grids/tables/' . $this->tables['table2'] . '/columns/string', $this->getServerHeader(), [
+        $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/tablesdb/tables/' . $this->tables['table2'] . '/columns/string', $this->getServerHeader(), [
             'key' => 'title',
             'size' => 256,
             'required' => true,
@@ -140,7 +140,7 @@ class DatabasesPermissionsTeamTest extends Scope
 
         $this->createTables($this->teams);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/grids/tables/' . $this->tables['table1'] . '/rows', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/tablesdb/tables/' . $this->tables['table1'] . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Lorem',
@@ -148,7 +148,7 @@ class DatabasesPermissionsTeamTest extends Scope
         ]);
         $this->assertEquals(201, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/grids/tables/' . $this->tables['table2'] . '/rows', $this->getServerHeader(), [
+        $response = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/tablesdb/tables/' . $this->tables['table2'] . '/rows', $this->getServerHeader(), [
             'rowId' => ID::unique(),
             'data' => [
                 'title' => 'Ipsum',
@@ -166,7 +166,7 @@ class DatabasesPermissionsTeamTest extends Scope
      */
     public function testReadRows($user, $table, $success, $users)
     {
-        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $this->databaseId . '/grids/tables/' . $table  . '/rows', [
+        $rows = $this->client->call(Client::METHOD_GET, '/databases/' . $this->databaseId . '/tablesdb/tables/' . $table  . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -186,7 +186,7 @@ class DatabasesPermissionsTeamTest extends Scope
      */
     public function testWriteRows($user, $table, $success, $users)
     {
-        $rows = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/grids/tables/' . $table  . '/rows', [
+        $rows = $this->client->call(Client::METHOD_POST, '/databases/' . $this->databaseId . '/tablesdb/tables/' . $table  . '/rows', [
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
diff --git a/tests/e2e/Services/GraphQL/Grids/AbuseTest.php b/tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
similarity index 100%
rename from tests/e2e/Services/GraphQL/Grids/AbuseTest.php
rename to tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
diff --git a/tests/e2e/Services/GraphQL/Grids/AuthTest.php b/tests/e2e/Services/GraphQL/TablesDB/AuthTest.php
similarity index 100%
rename from tests/e2e/Services/GraphQL/Grids/AuthTest.php
rename to tests/e2e/Services/GraphQL/TablesDB/AuthTest.php
diff --git a/tests/e2e/Services/GraphQL/Grids/DatabaseClientTest.php b/tests/e2e/Services/GraphQL/TablesDB/DatabaseClientTest.php
similarity index 100%
rename from tests/e2e/Services/GraphQL/Grids/DatabaseClientTest.php
rename to tests/e2e/Services/GraphQL/TablesDB/DatabaseClientTest.php
diff --git a/tests/e2e/Services/GraphQL/Grids/DatabaseServerTest.php b/tests/e2e/Services/GraphQL/TablesDB/DatabaseServerTest.php
similarity index 100%
rename from tests/e2e/Services/GraphQL/Grids/DatabaseServerTest.php
rename to tests/e2e/Services/GraphQL/TablesDB/DatabaseServerTest.php