diff --git a/composer.json b/composer.json
index 1dc7288441..9042cb088f 100644
--- a/composer.json
+++ b/composer.json
@@ -52,7 +52,7 @@
         "utopia-php/cache": "0.13.*",
         "utopia-php/cli": "0.15.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "1.*",
+        "utopia-php/database": "2.*",
         "utopia-php/detector": "0.1.*",
         "utopia-php/domains": "0.8.*",
         "utopia-php/dns": "0.3.*",
diff --git a/composer.lock b/composer.lock
index f82ba2aced..a1c8862168 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7553e976312b0423cc31544abb91caec",
+    "content-hash": "773efb29b9b584b1249790e0016c823a",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -3296,16 +3296,16 @@
         },
         {
             "name": "utopia-php/abuse",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "c5e2232033b507a07f72180dc56d37e1872ee7be"
+                "reference": "cd591568791556d246d901d6aaf9935ab02c3f9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/c5e2232033b507a07f72180dc56d37e1872ee7be",
-                "reference": "c5e2232033b507a07f72180dc56d37e1872ee7be",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/cd591568791556d246d901d6aaf9935ab02c3f9a",
+                "reference": "cd591568791556d246d901d6aaf9935ab02c3f9a",
                 "shasum": ""
             },
             "require": {
@@ -3313,7 +3313,7 @@
                 "ext-pdo": "*",
                 "ext-redis": "*",
                 "php": ">=8.0",
-                "utopia-php/database": "1.*"
+                "utopia-php/database": "2.*"
             },
             "require-dev": {
                 "laravel/pint": "1.*",
@@ -3341,9 +3341,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/1.0.0"
+                "source": "https://github.com/utopia-php/abuse/tree/1.0.1"
             },
-            "time": "2025-08-13T09:12:54+00:00"
+            "time": "2025-09-04T12:46:54+00:00"
         },
         {
             "name": "utopia-php/analytics",
@@ -3393,21 +3393,21 @@
         },
         {
             "name": "utopia-php/audit",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/audit.git",
-                "reference": "c0ed75f4d068f1f6c2e7149a909490d4214e72bb"
+                "reference": "5ef26d6a2ab2db7bb86288a1a6ef970307b46f22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/audit/zipball/c0ed75f4d068f1f6c2e7149a909490d4214e72bb",
-                "reference": "c0ed75f4d068f1f6c2e7149a909490d4214e72bb",
+                "url": "https://api.github.com/repos/utopia-php/audit/zipball/5ef26d6a2ab2db7bb86288a1a6ef970307b46f22",
+                "reference": "5ef26d6a2ab2db7bb86288a1a6ef970307b46f22",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.0",
-                "utopia-php/database": "1.*"
+                "utopia-php/database": "2.*"
             },
             "require-dev": {
                 "laravel/pint": "1.*",
@@ -3434,9 +3434,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/audit/issues",
-                "source": "https://github.com/utopia-php/audit/tree/1.0.0"
+                "source": "https://github.com/utopia-php/audit/tree/1.0.1"
             },
-            "time": "2025-08-13T09:09:00+00:00"
+            "time": "2025-09-04T12:46:43+00:00"
         },
         {
             "name": "utopia-php/cache",
@@ -3638,16 +3638,16 @@
         },
         {
             "name": "utopia-php/database",
-            "version": "1.4.5",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/database.git",
-                "reference": "1bac5c66567cd0718b4c133c8550b3c6076ff908"
+                "reference": "e4a03ba543abc4e436ec1b450750a14bd36011d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/1bac5c66567cd0718b4c133c8550b3c6076ff908",
-                "reference": "1bac5c66567cd0718b4c133c8550b3c6076ff908",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/e4a03ba543abc4e436ec1b450750a14bd36011d5",
+                "reference": "e4a03ba543abc4e436ec1b450750a14bd36011d5",
                 "shasum": ""
             },
             "require": {
@@ -3688,9 +3688,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/1.4.5"
+                "source": "https://github.com/utopia-php/database/tree/2.0.0"
             },
-            "time": "2025-09-11T03:10:29+00:00"
+            "time": "2025-09-04T12:36:53+00:00"
         },
         {
             "name": "utopia-php/detector",
@@ -4190,16 +4190,16 @@
         },
         {
             "name": "utopia-php/migration",
-            "version": "1.1.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/migration.git",
-                "reference": "c42935a6a4ee3701c68d24244e82ecb39e945ec4"
+                "reference": "6fb6f8f032cd34c3c65728a55d494adeac2ff038"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/c42935a6a4ee3701c68d24244e82ecb39e945ec4",
-                "reference": "c42935a6a4ee3701c68d24244e82ecb39e945ec4",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/6fb6f8f032cd34c3c65728a55d494adeac2ff038",
+                "reference": "6fb6f8f032cd34c3c65728a55d494adeac2ff038",
                 "shasum": ""
             },
             "require": {
@@ -4207,7 +4207,7 @@
                 "ext-curl": "*",
                 "ext-openssl": "*",
                 "php": ">=8.1",
-                "utopia-php/database": "1.*",
+                "utopia-php/database": "2.*",
                 "utopia-php/dsn": "0.2.*",
                 "utopia-php/framework": "0.33.*",
                 "utopia-php/storage": "0.18.*"
@@ -4240,9 +4240,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/migration/issues",
-                "source": "https://github.com/utopia-php/migration/tree/1.1.1"
+                "source": "https://github.com/utopia-php/migration/tree/1.1.0"
             },
-            "time": "2025-09-10T06:17:20+00:00"
+            "time": "2025-09-10T05:45:30+00:00"
         },
         {
             "name": "utopia-php/orchestration",
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 0939376c49..b22119fad1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Action.php
@@ -53,7 +53,7 @@ abstract class Action extends UtopiaAction
     /**
      * Get the SDK group name for the current action.
      */
-    protected function getSdkGroup(): string
+    protected function getSDKGroup(): string
     {
         return $this->isCollectionsAPI() ? 'collections' : 'tables';
     }
@@ -61,7 +61,7 @@ abstract class Action extends UtopiaAction
     /**
      * Get the SDK namespace for the current action.
      */
-    protected function getSdkNamespace(): string
+    protected function getSDKNamespace(): string
     {
         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 f3903d91a7..ae97d1b7cf 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
@@ -66,7 +66,7 @@ abstract class Action extends UtopiaAction
      *
      * Can be used for XList operations as well!
      */
-    protected function getSdkGroup(): string
+    protected function getSDKGroup(): string
     {
         return $this->isCollectionsAPI() ? 'attributes' : 'columns';
     }
@@ -74,7 +74,7 @@ abstract class Action extends UtopiaAction
     /**
      * Get the SDK namespace for the current action.
      */
-    protected function getSdkNamespace(): string
+    protected function getSDKNamespace(): string
     {
         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 6c4be252a0..6c8e5dcf3d 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
@@ -42,8 +42,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-boolean-attribute.md',
                 auth: [AuthType::KEY],
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 752e8c6c59..d4724ea551 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
@@ -42,8 +42,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-boolean-attribute.md',
                 auth: [AuthType::KEY],
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 5d5b8fe4bf..1f2098e7af 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
@@ -43,8 +43,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-datetime-attribute.md',
                 auth: [AuthType::KEY],
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 e1d1d40f75..cb4d0d924b 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
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-datetime-attribute.md',
                 auth: [AuthType::KEY],
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 8dec7530bf..eb51044323 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
@@ -43,8 +43,8 @@ class Delete extends Action
             ->label('audits.event', 'attribute.delete')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/delete-attribute.md',
                 auth: [AuthType::KEY],
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 bc58ca10af..cbfd66e4d9 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
@@ -43,8 +43,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-email-attribute.md',
                 auth: [AuthType::KEY],
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 53300725d7..2446722f7a 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
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-email-attribute.md',
                 auth: [AuthType::KEY],
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 cd22e87d1c..98ed83861d 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
@@ -45,8 +45,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-enum-attribute.md',
                 auth: [AuthType::KEY],
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 951e43effe..23dc807360 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
@@ -44,8 +44,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-enum-attribute.md',
                 auth: [AuthType::KEY],
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 2a8253c22c..83deb92edc 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
@@ -45,8 +45,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-float-attribute.md',
                 auth: [AuthType::KEY],
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 327a766cee..7f295a1a94 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
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-float-attribute.md',
                 auth: [AuthType::KEY],
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 28ee584778..91fa3582f7 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
@@ -47,8 +47,8 @@ class Get extends Action
             ->label('scope', 'collections.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/get-attribute.md',
                 auth: [AuthType::KEY],
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 aa699b4a49..6e6264466c 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
@@ -43,8 +43,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-ip-attribute.md',
                 auth: [AuthType::KEY],
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 f61cf21732..6cedf10760 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
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-ip-attribute.md',
                 auth: [AuthType::KEY],
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 81a11b0471..090d63c403 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
@@ -45,8 +45,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-integer-attribute.md',
                 auth: [AuthType::KEY],
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 11cfb24943..b6ae79bd8a 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
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-integer-attribute.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Create.php
index 4eb3345823..f691fc29cf 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Create.php
@@ -44,8 +44,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-line-attribute.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Update.php
index 8fcb867923..52f04ba5bc 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Line/Update.php
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-line-attribute.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Create.php
index 47c88497ba..aae715ba1e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Create.php
@@ -44,8 +44,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-point-attribute.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Update.php
index bffe802927..73964ab461 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Point/Update.php
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-point-attribute.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Create.php
index 6cc74254ae..6fbbd46d2c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Create.php
@@ -44,8 +44,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-polygon-attribute.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Update.php
index d78bfa8ef0..23eb06f45d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Attributes/Polygon/Update.php
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-polygon-attribute.md',
                 auth: [AuthType::KEY],
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 a062816329..75471b826c 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
@@ -45,8 +45,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-relationship-attribute.md',
                 auth: [AuthType::KEY],
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 c19c4ff046..897cbd434f 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
@@ -41,8 +41,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-relationship-attribute.md',
                 auth: [AuthType::KEY],
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 592aa8ee93..1527c4d1d9 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
@@ -47,8 +47,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-string-attribute.md',
                 auth: [AuthType::KEY],
@@ -95,7 +95,7 @@ class Create extends Action
         array $plan
     ): void {
         if (!App::isDevelopment() && $encrypt && !empty($plan) && !($plan['databasesAllowEncrypt'] ?? false)) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Encrypted string ' . $this->getSdkGroup() . ' are not available on your plan. Please upgrade to create encrypted string ' . $this->getSdkGroup() . '.');
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Encrypted string ' . $this->getSDKGroup() . ' are not available on your plan. Please upgrade to create encrypted string ' . $this->getSDKGroup() . '.');
         }
 
         if ($encrypt && $size < APP_DATABASE_ENCRYPT_SIZE_MIN) {
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 03efac1430..8614dfb202 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
@@ -45,8 +45,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-string-attribute.md',
                 auth: [AuthType::KEY],
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 39153b3cb8..ce0175966b 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
@@ -43,8 +43,8 @@ class Create extends Action
             ->label('audits.event', 'attribute.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-url-attribute.md',
                 auth: [AuthType::KEY],
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 7ace4d0683..7ba12ad98a 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
@@ -43,8 +43,8 @@ class Update extends Action
             ->label('audits.event', 'attribute.update')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-url-attribute.md',
                 auth: [AuthType::KEY],
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 1852290f76..6daa180df9 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
@@ -41,8 +41,8 @@ class XList extends Action
             ->label('scope', 'collections.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/list-attributes.md',
                 auth: [AuthType::KEY],
@@ -141,7 +141,7 @@ class XList extends Action
 
         $response->dynamic(new Document([
             'total' => $total,
-            $this->getSdkGroup() => $attributes,
+            $this->getSDKGroup() => $attributes,
         ]), $this->getResponseModel());
     }
 }
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 e06dae89bb..b810ce602f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Create.php
@@ -52,7 +52,7 @@ class Create extends Action
             ->label('audits.resource', 'database/{request.databaseId}/collection/{response.$id}')
             ->label('sdk', new Method(
                 namespace: 'databases',
-                group: $this->getSdkGroup(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-collection.md',
                 auth: [AuthType::KEY],
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 d20570fb43..d124a47289 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Delete.php
@@ -42,7 +42,7 @@ class Delete extends Action
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
                 namespace: 'databases',
-                group: $this->getSdkGroup(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/delete-collection.md',
                 auth: [AuthType::KEY],
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 d1d0738990..871d1c4cbb 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
@@ -76,7 +76,7 @@ abstract class Action extends AppwriteAction
      *
      * Can be used for XList operations as well!
      */
-    protected function getSdkGroup(): string
+    protected function getSDKGroup(): string
     {
         return $this->isCollectionsAPI() ? 'documents' : 'rows';
     }
@@ -84,7 +84,7 @@ abstract class Action extends AppwriteAction
     /**
      * Get the SDK namespace for the current action.
      */
-    protected function getSdkNamespace(): string
+    protected function getSDKNamespace(): string
     {
         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 39bb5b1f97..cbe0ddceaf 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
@@ -54,8 +54,8 @@ class Decrement extends Action
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/decrement-document-attribute.md',
                 auth: [AuthType::SESSION, AuthType::JWT, AuthType::ADMIN, AuthType::KEY],
@@ -166,9 +166,9 @@ class Decrement extends Action
         } catch (NotFoundException) {
             throw new Exception($this->getStructureNotFoundException());
         } catch (LimitException) {
-            throw new Exception($this->getLimitException(), $this->getSdkNamespace() . ' "' . $attribute . '" has reached the minimum value of ' . $min);
+            throw new Exception($this->getLimitException(), $this->getSDKNamespace() . ' "' . $attribute . '" has reached the minimum value of ' . $min);
         } catch (TypeException) {
-            throw new Exception(Exception::ATTRIBUTE_TYPE_INVALID, $this->getSdkNamespace() . ' "' . $attribute . '" is not a number');
+            throw new Exception(Exception::ATTRIBUTE_TYPE_INVALID, $this->getSDKNamespace() . ' "' . $attribute . '" is not a number');
         } catch (InvalidArgumentException $e) {
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $e->getMessage());
         }
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 0fa19f8370..22e19c69a5 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
@@ -54,8 +54,8 @@ class Increment extends Action
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/increment-document-attribute.md',
                 auth: [AuthType::SESSION, AuthType::JWT, AuthType::ADMIN, AuthType::KEY],
@@ -166,9 +166,9 @@ class Increment extends Action
         } catch (NotFoundException) {
             throw new Exception($this->getStructureNotFoundException());
         } catch (LimitException) {
-            throw new Exception($this->getLimitException(), $this->getSdkNamespace() . ' "' . $attribute . '" has reached the maximum value of ' . $max);
+            throw new Exception($this->getLimitException(), $this->getSDKNamespace() . ' "' . $attribute . '" has reached the maximum value of ' . $max);
         } catch (TypeException) {
-            throw new Exception(Exception::ATTRIBUTE_TYPE_INVALID, $this->getSdkNamespace() . ' "' . $attribute . '" is not a number');
+            throw new Exception(Exception::ATTRIBUTE_TYPE_INVALID, $this->getSDKNamespace() . ' "' . $attribute . '" is not a number');
         } catch (InvalidArgumentException $e) {
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $e->getMessage());
         }
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 82f940bb62..57e81c1f3c 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
@@ -51,8 +51,8 @@ class Delete extends Action
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/delete-documents.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
@@ -101,7 +101,7 @@ class Delete extends Action
         );
 
         if ($hasRelationships) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk delete is not supported for ' . $this->getSdkNamespace() . ' with relationship attributes');
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk delete is not supported for ' . $this->getSDKNamespace() . ' with relationship attributes');
         }
 
         $originalQueries = $queries;
@@ -152,7 +152,7 @@ class Delete extends Action
 
             // Return successful response without actually deleting documents
             $response->dynamic(new Document([
-                $this->getSdkGroup() => [],
+                $this->getSDKGroup() => [],
                 'total' => 0, // Can't predict how many would be deleted
             ]), $this->getResponseModel());
             return;
@@ -187,7 +187,7 @@ class Delete extends Action
 
         $response->dynamic(new Document([
             'total' => $modified,
-            $this->getSdkGroup() => $documents,
+            $this->getSDKGroup() => $documents,
         ]), $this->getResponseModel());
 
         $this->triggerBulk(
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 1b9559d4b9..c2d1bb06fc 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
@@ -54,8 +54,8 @@ class Update extends Action
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-documents.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
@@ -113,7 +113,7 @@ class Update extends Action
         );
 
         if ($hasRelationships) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk update is not supported for ' . $this->getSdkNamespace() . ' with relationship attributes');
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk update is not supported for ' . $this->getSDKNamespace() . ' with relationship attributes');
         }
 
         $originalQueries = $queries;
@@ -174,7 +174,7 @@ class Update extends Action
 
             // Return successful response without actually updating documents
             $response->dynamic(new Document([
-                $this->getSdkGroup() => [],
+                $this->getSDKGroup() => [],
                 'total' => 0, // Can't predict how many would be updated
             ]), $this->getResponseModel());
             return;
@@ -214,7 +214,7 @@ class Update extends Action
 
         $response->dynamic(new Document([
             'total' => $modified,
-            $this->getSdkGroup() => $documents
+            $this->getSDKGroup() => $documents
         ]), $this->getResponseModel());
 
         $this->triggerBulk(
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 618d640d95..371e0c7360 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
@@ -52,8 +52,8 @@ class Upsert extends Action
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', [
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: self::getName(),
                     description: '/docs/references/databases/upsert-documents.md',
                     auth: [AuthType::ADMIN, AuthType::KEY],
@@ -103,7 +103,7 @@ class Upsert extends Action
         );
 
         if ($hasRelationships) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk upsert is not supported for ' . $this->getSdkNamespace() .  ' with relationship attributes');
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk upsert is not supported for ' . $this->getSDKNamespace() .  ' with relationship attributes');
         }
 
         foreach ($documents as $key => $document) {
@@ -150,7 +150,7 @@ class Upsert extends Action
 
             // Return successful response without actually upserting documents
             $response->dynamic(new Document([
-                $this->getSdkGroup() => [],
+                $this->getSDKGroup() => [],
                 'total' => \count($documents),
             ]), $this->getResponseModel());
 
@@ -192,7 +192,7 @@ class Upsert extends Action
 
         $response->dynamic(new Document([
             'total' => $modified,
-            $this->getSdkGroup() => $upserted
+            $this->getSDKGroup() => $upserted
         ]), $this->getResponseModel());
 
         $this->triggerBulk(
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 afc5036aa3..7fd29ba6ef 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
@@ -63,8 +63,8 @@ class Create extends Action
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', [
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: self::getName(),
                     desc: 'Create document',
                     description: '/docs/references/databases/create-document.md',
@@ -90,8 +90,8 @@ class Create extends Action
                     ),
                 ),
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: $this->getBulkActionName(self::getName()),
                     desc: 'Create documents',
                     description: '/docs/references/databases/create-documents.md',
@@ -148,7 +148,7 @@ class Create extends Action
         }
         if (!empty($data) && !empty($documents)) {
             // Both single and bulk documents provided
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'You can only send one of the following parameters: data, ' . $this->getSdkGroup());
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'You can only send one of the following parameters: data, ' . $this->getSDKGroup());
         }
         if (!empty($data) && empty($documentId)) {
             // Single document provided without document ID
@@ -161,12 +161,12 @@ class Create extends Action
             $documentId = $this->isCollectionsAPI() ? 'documentId' : 'rowId';
             throw new Exception(
                 Exception::GENERAL_BAD_REQUEST,
-                "Param \"$documentId\" is not allowed when creating multiple " . $this->getSdkGroup() . ', set "$id" on each instead.'
+                "Param \"$documentId\" is not allowed when creating multiple " . $this->getSDKGroup() . ', set "$id" on each instead.'
             );
         }
         if (!empty($documents) && !empty($permissions)) {
             // Bulk documents provided with permissions
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Param "permissions" is disallowed when creating multiple ' . $this->getSdkGroup() . ', set "$permissions" on each instead');
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Param "permissions" is disallowed when creating multiple ' . $this->getSDKGroup() . ', set "$permissions" on each instead');
         }
 
         $isBulk = true;
@@ -200,7 +200,7 @@ class Create extends Action
         );
 
         if ($isBulk && $hasRelationships) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk create is not supported for ' . $this->getSdkNamespace() .' with relationship ' . $this->getStructureContext());
+            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk create is not supported for ' . $this->getSDKNamespace() .' with relationship ' . $this->getStructureContext());
         }
 
         $setPermissions = function (Document $document, ?array $permissions) use ($user, $isAPIKey, $isPrivilegedUser, $isBulk) {
@@ -407,7 +407,7 @@ class Create extends Action
             // Return successful response without actually creating documents
             if ($isBulk) {
                 $response->dynamic(new Document([
-                    $this->getSdkGroup() => [],
+                    $this->getSDKGroup() => [],
                     'total' => \count($documents),
                 ]), $this->getBulkResponseModel());
             } else {
@@ -468,7 +468,7 @@ class Create extends Action
         if ($isBulk) {
             $response->dynamic(new Document([
                 'total' => count($documents),
-                $this->getSdkGroup() => $documents
+                $this->getSDKGroup() => $documents
             ]), $this->getBulkResponseModel());
 
             $this->triggerBulk(
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 8459e06c43..be73068c06 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
@@ -54,8 +54,8 @@ class Delete extends Action
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/delete-document.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
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 cced1440a5..3d8cd9198c 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
@@ -43,8 +43,8 @@ class Get extends Action
             ->label('scope', 'documents.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/get-document.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
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 93c8639520..ac7602ff4c 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
@@ -48,7 +48,7 @@ class XList extends Action
             ->label('scope', 'documents.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: 'logs',
                 name: self::getName(),
                 description: '/docs/references/databases/get-document-logs.md',
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 a2376b44a2..d144ab9194 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
@@ -56,8 +56,8 @@ class Update extends Action
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-document.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
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 6690e0214f..f93aea88c8 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
@@ -58,8 +58,8 @@ class Upsert extends Action
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', [
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: self::getName(),
                     description: '/docs/references/databases/upsert-document.md',
                     auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
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 7e6931395e..d2f90c0951 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
@@ -46,8 +46,8 @@ class XList extends Action
             ->label('scope', 'documents.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/list-documents.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -206,7 +206,7 @@ class XList extends Action
         $response->dynamic(new Document([
             'total' => $total,
             // rows or documents
-            $this->getSdkGroup() => $documents,
+            $this->getSDKGroup() => $documents,
         ]), $this->getResponseModel());
     }
 }
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 af4b6bf733..89739570c7 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Get.php
@@ -37,7 +37,7 @@ class Get extends Action
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: 'databases',
-                group: $this->getSdkGroup(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/get-collection.md',
                 auth: [AuthType::KEY],
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 f136fdd29b..400d716e41 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
@@ -52,7 +52,7 @@ abstract class Action extends UtopiaAction
     /**
      * Get the SDK group name for the current action.
      */
-    final protected function getSdkGroup(): string
+    final protected function getSDKGroup(): string
     {
         return 'indexes';
     }
@@ -60,7 +60,7 @@ abstract class Action extends UtopiaAction
     /**
      * Get the SDK namespace for the current action.
      */
-    final protected function getSdkNamespace(): string
+    final protected function getSDKNamespace(): string
     {
         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 733259f091..0c6ef8bb23 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
@@ -51,8 +51,8 @@ class Create extends Action
             ->label('audits.event', 'index.create')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/create-index.md',
                 auth: [AuthType::KEY],
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 9ba4c98046..2bccfdfb52 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
@@ -46,8 +46,8 @@ class Delete extends Action
             ->label('audits.event', 'index.delete')
             ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/delete-index.md',
                 auth: [AuthType::KEY],
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 9e05cc79c7..3d118d1922 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
@@ -37,8 +37,8 @@ class Get extends Action
             ->label('scope', 'collections.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/get-index.md',
                 auth: [AuthType::KEY],
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 c0aa9457e7..60e52f883a 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
@@ -42,8 +42,8 @@ class XList extends Action
             ->label('scope', 'collections.read')
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/list-indexes.md',
                 auth: [AuthType::KEY],
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 1309793234..fa95d375c1 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
@@ -49,7 +49,7 @@ class XList extends Action
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: 'databases',
-                group: $this->getSdkGroup(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/get-collection-logs.md',
                 auth: [AuthType::ADMIN],
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 5bf740d7d1..49870002ce 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
@@ -45,7 +45,7 @@ class Update extends Action
             ->label('audits.resource', 'database/{request.databaseId}/collections/{request.collectionId}')
             ->label('sdk', new Method(
                 namespace: 'databases',
-                group: $this->getSdkGroup(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/update-collection.md',
                 auth: [AuthType::KEY],
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 f2f7a2233a..b4cc5470d9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/XList.php
@@ -44,7 +44,7 @@ class XList extends Action
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: 'databases',
-                group: $this->getSdkGroup(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/databases/list-collections.md',
                 auth: [AuthType::KEY],
@@ -121,7 +121,7 @@ class XList extends Action
 
         $response->dynamic(new Document([
             'total' => $total,
-            $this->getSdkGroup() => $collections,
+            $this->getSDKGroup() => $collections,
         ]), $this->getResponseModel());
     }
 }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
new file mode 100644
index 0000000000..512deb8fc8
--- /dev/null
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
+
+use Appwrite\Extend\Exception;
+use Utopia\Platform\Action as UtopiaAction;
+
+abstract class Action extends UtopiaAction
+{
+    /**
+     * The current API context (either 'table' or 'collection').
+     */
+    private ?string $context = COLLECTIONS;
+
+    public function setHttpPath(string $path): UtopiaAction
+    {
+        if (\str_contains($path, '/tablesdb')) {
+            $this->context = TABLES;
+        }
+        return parent::setHttpPath($path);
+    }
+
+    /**
+     * Get the current API context.
+     */
+    protected function getContext(): string
+    {
+        return $this->context;
+    }
+
+    /**
+     * Determine if the current action is for the Collections API.
+     */
+    protected function isCollectionsAPI(): bool
+    {
+        return $this->getContext() === COLLECTIONS;
+    }
+
+    /**
+     * Get the key used in event parameters (e.g., 'collectionId' or 'tableId').
+     */
+    protected function getGroupId(): string
+    {
+        return $this->getContext() . 'Id';
+    }
+
+    /**
+     * Get the resource type for the current action (either 'document' or 'row').
+     */
+    protected function getResource(): string
+    {
+        return $this->isCollectionsAPI() ? 'document' : 'row';
+    }
+
+    /**
+     * Get the resource ID key for the current action.
+     */
+    protected function getResourceId(): string
+    {
+        return $this->getResource() . 'Id';
+    }
+
+    protected function getAttributeKey(): string
+    {
+        return $this->isCollectionsAPI() ? 'attribute' : 'column';
+    }
+}
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Create.php
index d2f114a888..77589e848a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Create.php
@@ -2,7 +2,6 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
 
-use Appwrite\Platform\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -19,7 +18,7 @@ class Create extends Action
 {
     public static function getName(): string
     {
-        return 'createTransaction';
+        return 'createDatabasesTransaction';
     }
 
     protected function getResponseModel(): string
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Delete.php
index 77dde44bf6..81315498f6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Delete.php
@@ -3,7 +3,6 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
 
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -18,7 +17,7 @@ class Delete extends Action
 {
     public static function getName(): string
     {
-        return 'deleteTransaction';
+        return 'deleteDatabasesTransaction';
     }
 
     protected function getResponseModel(): string
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Get.php
index 3c7eec7741..6afe28d626 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Get.php
@@ -3,7 +3,6 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
 
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -17,7 +16,7 @@ class Get extends Action
 {
     public static function getName(): string
     {
-        return 'getTransaction';
+        return 'getDatabasesTransaction';
     }
 
     protected function getResponseModel(): string
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
index 8216d96d5d..58505591ff 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
@@ -3,7 +3,7 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions\Operations;
 
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Transactions\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -21,7 +21,7 @@ class Create extends Action
 {
     public static function getName(): string
     {
-        return 'createOperations';
+        return 'createDatabasesTransactionOperations';
     }
 
     protected function getResponseModel(): string
@@ -84,7 +84,9 @@ class Create extends Action
                 throw new Exception(Exception::DATABASE_NOT_FOUND);
             }
 
-            $collection = $collections[$operation['collectionId']] ??= $dbForProject->getDocument('database_' . $database->getSequence(), $operation['collectionId']);
+            $collection = $collections[$operation[$this->getGroupId()]] ??=
+                $dbForProject->getDocument('database_' . $database->getSequence(), $operation[$this->getGroupId()]);
+
             if ($collection->isEmpty()) {
                 throw new Exception(Exception::COLLECTION_NOT_FOUND);
             }
@@ -94,7 +96,7 @@ class Create extends Action
                 'databaseInternalId' => $database->getSequence(),
                 'collectionInternalId' => $collection->getSequence(),
                 'transactionInternalId' => $transaction->getSequence(),
-                'documentId' => $operation['documentId'] ?? null,
+                'documentId' => $operation[$this->getResourceId()] ?? null,
                 'action' => $operation['action'],
                 'data' => $operation['data'] ?? [],
             ]);
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
index e854306a47..3e504822f6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
@@ -4,7 +4,6 @@ namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
 
 use Appwrite\Event\Delete;
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -27,7 +26,7 @@ class Update extends Action
 {
     public static function getName(): string
     {
-        return 'updateTransaction';
+        return 'updateDatabasesTransaction';
     }
 
     protected function getResponseModel(): string
@@ -73,11 +72,10 @@ class Update extends Action
      * @param bool $rollback
      * @param UtopiaResponse $response
      * @param Database $dbForProject
-     * @param \Appwrite\Platform\Modules\Databases\Http\Databases\Transactions\Delete $queueForDeletes
+     * @param Delete $queueForDeletes
      * @return void
      * @throws ConflictException
      * @throws Exception
-     * @throws \DateMalformedStringException
      * @throws \Throwable
      * @throws \Utopia\Database\Exception
      * @throws Authorization
@@ -357,7 +355,7 @@ class Update extends Action
             $state[$collectionId][$documentId] = $dbForProject->increaseDocumentAttribute(
                 collection: $collectionId,
                 id: $documentId,
-                attribute: $data['attribute'],
+                attribute: $data[$this->getAttributeKey()],
                 value: $data['value'] ?? 1,
                 max: $data['max'] ?? null
             );
@@ -369,7 +367,7 @@ class Update extends Action
             $dbForProject->increaseDocumentAttribute(
                 collection: $collectionId,
                 id: $documentId,
-                attribute: $data['attribute'],
+                attribute: $data[$this->getAttributeKey()],
                 value: $data['value'] ?? 1,
                 max: $data['max'] ?? null
             );
@@ -394,7 +392,7 @@ class Update extends Action
             $state[$collectionId][$documentId] = $dbForProject->decreaseDocumentAttribute(
                 collection: $collectionId,
                 id: $documentId,
-                attribute: $data['attribute'],
+                attribute: $data[$this->getAttributeKey()],
                 value: $data['value'] ?? 1,
                 min: $data['min'] ?? null
             );
@@ -406,7 +404,7 @@ class Update extends Action
             $dbForProject->decreaseDocumentAttribute(
                 collection: $collectionId,
                 id: $documentId,
-                attribute: $data['attribute'],
+                attribute: $data[$this->getAttributeKey()],
                 value: $data['value'] ?? 1,
                 min: $data['min'] ?? null
             );
@@ -447,8 +445,6 @@ class Update extends Action
         \DateTime $createdAt,
         array &$state
     ): void {
-        \var_dump($data);
-
         $queries = Query::parseQueries($data['queries'] ?? []);
 
         $dbForProject->updateDocuments(
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/XList.php
index e3bd8144a9..b13ca8c52b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/XList.php
@@ -3,7 +3,6 @@
 namespace Appwrite\Platform\Modules\Databases\Http\Databases\Transactions;
 
 use Appwrite\Extend\Exception;
-use Appwrite\Platform\Action;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -20,7 +19,7 @@ class XList extends Action
 {
     public static function getName(): string
     {
-        return 'listTransactions';
+        return 'listDatabasesTransactions';
     }
 
     protected function getResponseModel(): string
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php
index 5222d2e133..8f94ba01ae 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php
@@ -37,8 +37,8 @@ class Create extends BooleanCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-boolean-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php
index 3c6ef50813..3122227351 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php
@@ -39,8 +39,8 @@ class Update extends BooleanUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-boolean-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php
index 9598278ffc..db5a3059f1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php
@@ -39,8 +39,8 @@ class Create extends DatetimeCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-datetime-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php
index d7b5ec2448..151422af75 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php
@@ -41,8 +41,8 @@ class Update extends DatetimeUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-datetime-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php
index 50a148ce19..26f4ffa898 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php
@@ -38,8 +38,8 @@ class Delete extends AttributesDelete
             ->label('audits.event', 'column.delete')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/delete-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php
index e28a216fff..3a8d492e4e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php
@@ -38,8 +38,8 @@ class Create extends EmailCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-email-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php
index 0fb856acb9..4d32489357 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php
@@ -40,8 +40,8 @@ class Update extends EmailUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-email-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php
index 5b9d89c7e9..68dc2f8e08 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php
@@ -40,8 +40,8 @@ class Create extends EnumCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-enum-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php
index 0c00e3f268..3b611a5fde 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php
@@ -42,8 +42,8 @@ class Update extends EnumUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-enum-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php
index 5967b00196..9fe6987cab 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php
@@ -38,8 +38,8 @@ class Create extends FloatCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-float-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php
index 9486b3a75c..023e2e834e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php
@@ -40,8 +40,8 @@ class Update extends FloatUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-float-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php
index d536a7aaf2..c20ef58a39 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php
@@ -44,8 +44,8 @@ class Get extends AttributesGet
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/get-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php
index 325a9382e5..81ca8da81f 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php
@@ -38,8 +38,8 @@ class Create extends IPCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-ip-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php
index b9e6368307..0db95b0206 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php
@@ -40,8 +40,8 @@ class Update extends IPUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-ip-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php
index bd6fec3f53..dfca51a6c5 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php
@@ -38,8 +38,8 @@ class Create extends IntegerCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-integer-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php
index be92811d1b..a1568d069b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php
@@ -40,8 +40,8 @@ class Update extends IntegerUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-integer-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Create.php
index f60d4dd5b8..9f3dc3b01e 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Create.php
@@ -40,8 +40,8 @@ class Create extends LineCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-line-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Update.php
index 19c6df202d..cbf0a50de2 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Line/Update.php
@@ -41,8 +41,8 @@ class Update extends LineUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-line-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Create.php
index 47d97e8077..71e51425d6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Create.php
@@ -40,8 +40,8 @@ class Create extends PointCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-point-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Update.php
index 2e98bf2cf9..ef3e7f6331 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Point/Update.php
@@ -41,8 +41,8 @@ class Update extends PointUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-point-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Create.php
index 371d5f8fd5..985c264393 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Create.php
@@ -40,8 +40,8 @@ class Create extends PolygonCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-polygon-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Update.php
index c5654b77d4..d749335e2c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Polygon/Update.php
@@ -41,8 +41,8 @@ class Update extends PolygonUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-polygon-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php
index b6f9663f77..0a6c76d8c5 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php
@@ -39,8 +39,8 @@ class Create extends RelationshipCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-relationship-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php
index 421e11af91..b645454be1 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php
@@ -39,8 +39,8 @@ class Update extends RelationshipUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-relationship-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php
index 14f0c8321e..b6cf5fa8c9 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php
@@ -40,8 +40,8 @@ class Create extends StringCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-string-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php
index fc45557f3b..4f3989ac37 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php
@@ -42,8 +42,8 @@ class Update extends StringUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-string-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php
index bc53ad5250..99ec36b721 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php
@@ -38,8 +38,8 @@ class Create extends URLCreate
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-url-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php
index 36bd7dc054..51168b0383 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php
@@ -40,8 +40,8 @@ class Update extends URLUpdate
             ->label('audits.event', 'column.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-url-column.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php
index ca41bb024d..13bf3257e3 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php
@@ -33,8 +33,8 @@ class XList extends AttributesXList
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/list-columns.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php
index 3965e12a74..4f62200d7c 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php
@@ -40,7 +40,7 @@ class Create extends CollectionCreate
             ->label('audits.event', 'table.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{response.$id}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: 'tables',
                 name: self::getName(),
                 description: '/docs/references/tablesdb/create-table.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php
index 9bfdf42cef..de068d5b29 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php
@@ -36,7 +36,7 @@ class Delete extends CollectionDelete
             ->label('audits.event', 'table.delete')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: 'tables',
                 name: self::getName(),
                 description: '/docs/references/tablesdb/delete-table.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php
index a7d33478f7..be6ec5d9e7 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php
@@ -33,7 +33,7 @@ class Get extends CollectionGet
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: 'tables',
                 name: self::getName(),
                 description: '/docs/references/tablesdb/get-table.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php
index a2a5c8b453..5b61a4bacc 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php
@@ -42,8 +42,8 @@ class Create extends IndexCreate
             ->label('audits.event', 'index.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                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/tablesdb/create-index.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php
index 586bad78f4..9b1583585b 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php
@@ -41,8 +41,8 @@ class Delete extends IndexDelete
             ->label('audits.event', 'index.delete')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                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/tablesdb/delete-index.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php
index 3f2978b547..313260aaee 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php
@@ -34,8 +34,8 @@ class Get extends IndexGet
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                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/tablesdb/get-index.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php
index c275fd2771..b12cb43f2d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php
@@ -34,8 +34,8 @@ class XList extends IndexXList
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                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/tablesdb/list-indexes.md',
                 auth: [AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php
index 6d386df4f6..0680649544 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php
@@ -30,8 +30,8 @@ class XList extends CollectionLogXList
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/get-table-logs.md',
                 auth: [AuthType::ADMIN],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php
index a46ffe6cba..7d4396b785 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php
@@ -40,8 +40,8 @@ class Delete extends DocumentsDelete
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/delete-rows.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php
index 1fc8ba031b..5005ab4f41 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php
@@ -41,8 +41,8 @@ class Update extends DocumentsUpdate
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-rows.md',
                 auth: [AuthType::ADMIN, AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php
index 3f1349e2f7..d0a1f08003 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php
@@ -41,8 +41,8 @@ class Upsert extends DocumentsUpsert
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', [
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: self::getName(),
                     description: '/docs/references/tablesdb/upsert-rows.md',
                     auth: [AuthType::ADMIN, AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php
index 06cfdb5150..d42cf5e9eb 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php
@@ -41,8 +41,8 @@ class Decrement extends DecrementDocumentAttribute
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/decrement-row-column.md',
                 auth: [AuthType::SESSION, AuthType::JWT, AuthType::ADMIN, AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php
index bddda28b25..c58e16c8e3 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php
@@ -41,8 +41,8 @@ class Increment extends IncrementDocumentAttribute
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/increment-row-column.md',
                 auth: [AuthType::SESSION, AuthType::JWT, AuthType::ADMIN, AuthType::KEY],
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php
index 88fc3c5096..9742208ed6 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php
@@ -50,8 +50,8 @@ class Create extends DocumentCreate
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', [
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: self::getName(),
                     desc: 'Create row',
                     description: '/docs/references/tablesdb/create-row.md',
@@ -73,8 +73,8 @@ class Create extends DocumentCreate
                     ]
                 ),
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: $this->getBulkActionName(self::getName()),
                     desc: 'Create rows',
                     description: '/docs/references/tablesdb/create-rows.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php
index 0695573ee1..c45029aaab 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php
@@ -45,8 +45,8 @@ class Delete extends DocumentDelete
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/delete-row.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -67,6 +67,7 @@ class Delete extends DocumentDelete
             ->inject('dbForProject')
             ->inject('queueForEvents')
             ->inject('queueForStatsUsage')
+            ->inject('transactionState')
             ->inject('plan')
             ->callback($this->action(...));
     }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php
index 5704f75d82..11faf443d3 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php
@@ -35,8 +35,8 @@ class Get extends DocumentGet
             ->label('scope', ['rows.read', 'documents.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/get-row.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -52,9 +52,11 @@ class Get extends DocumentGet
             ->param('tableId', '', new UID(), 'Table ID. You can create a new table using the Database service [server integration](https://appwrite.io/docs/server/tablesdb#tablesDBCreate).')
             ->param('rowId', '', new UID(), 'Row ID.')
             ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), '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.', true)
+            ->param('transactionId', null, new UID(), 'Transaction ID to read uncommitted changes within the transaction.', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('queueForStatsUsage')
+            ->inject('transactionState')
             ->callback($this->action(...));
     }
 }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php
index a80249070b..5f1efa2953 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php
@@ -30,7 +30,7 @@ class XList extends DocumentLogXList
             ->label('scope', ['rows.read', 'documents.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: 'logs',
                 name: self::getName(),
                 description: '/docs/references/tablesdb/get-row-logs.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php
index 6d60cceb22..cb1d5888cf 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php
@@ -42,8 +42,8 @@ class Update extends DocumentUpdate
             ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT * 2)
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-row.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -66,6 +66,7 @@ class Update extends DocumentUpdate
             ->inject('dbForProject')
             ->inject('queueForEvents')
             ->inject('queueForStatsUsage')
+            ->inject('transactionState')
             ->inject('plan')
             ->callback($this->action(...));
     }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php
index e16fa67e97..0bc373cc93 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php
@@ -43,8 +43,8 @@ class Upsert extends DocumentUpsert
             ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
             ->label('sdk', [
                 new Method(
-                    namespace: $this->getSdkNamespace(),
-                    group: $this->getSdkGroup(),
+                    namespace: $this->getSDKNamespace(),
+                    group: $this->getSDKGroup(),
                     name: self::getName(),
                     description: '/docs/references/tablesdb/upsert-row.md',
                     auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -69,6 +69,7 @@ class Upsert extends DocumentUpsert
             ->inject('dbForProject')
             ->inject('queueForEvents')
             ->inject('queueForStatsUsage')
+            ->inject('transactionState')
             ->inject('plan')
             ->callback($this->action(...));
     }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php
index 5d503f1c59..6b7fc699fd 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php
@@ -35,8 +35,8 @@ class XList extends DocumentXList
             ->label('scope', ['rows.read', 'documents.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
-                group: $this->getSdkGroup(),
+                namespace: $this->getSDKNamespace(),
+                group: $this->getSDKGroup(),
                 name: self::getName(),
                 description: '/docs/references/tablesdb/list-rows.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -51,9 +51,11 @@ class XList extends DocumentXList
             ->param('databaseId', '', new UID(), 'Database ID.')
             ->param('tableId', '', new UID(), 'Table ID. You can create a new table using the TableDB service [server integration](https://appwrite.io/docs/server/tablesdbdb#tablesdbCreate).')
             ->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), '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.', true)
+            ->param('transactionId', null, new UID(), 'Transaction ID to read uncommitted changes within the transaction.', true)
             ->inject('response')
             ->inject('dbForProject')
             ->inject('queueForStatsUsage')
+            ->inject('transactionState')
             ->callback($this->action(...));
     }
 }
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php
index 0fcdf319d2..8424b37a6d 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php
@@ -39,7 +39,7 @@ class Update extends CollectionUpdate
             ->label('audits.event', 'table.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: 'tables',
                 name: self::getName(),
                 description: '/docs/references/tablesdb/update-table.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php
index 87f720e689..0fb44ee94a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php
@@ -34,7 +34,7 @@ class Get extends CollectionUsageGet
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: null,
                 name: self::getName(),
                 description: '/docs/references/tablesdb/get-table-usage.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php
index d9a92e41b1..a47a972371 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php
@@ -35,7 +35,7 @@ class XList extends CollectionXList
             ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
-                namespace: $this->getSdkNamespace(),
+                namespace: $this->getSDKNamespace(),
                 group: 'tables',
                 name: self::getName(),
                 description: '/docs/references/tablesdb/list-tables.md',
diff --git a/src/Appwrite/Platform/Modules/Databases/Services/Registry/Legacy.php b/src/Appwrite/Platform/Modules/Databases/Services/Registry/Legacy.php
index 3286aecf93..7de95da255 100644
--- a/src/Appwrite/Platform/Modules/Databases/Services/Registry/Legacy.php
+++ b/src/Appwrite/Platform/Modules/Databases/Services/Registry/Legacy.php
@@ -78,6 +78,7 @@ use Utopia\Platform\Service;
  * - Documents
  * - Attributes
  * - Indexes
+ * - Transactions
  */
 class Legacy extends Base
 {
diff --git a/tests/e2e/Services/Databases/TablesDB/Transactions/ACIDTest.php b/tests/e2e/Services/Databases/TablesDB/Transactions/ACIDTest.php
index 89e095cb53..9bf459b19f 100644
--- a/tests/e2e/Services/Databases/TablesDB/Transactions/ACIDTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/Transactions/ACIDTest.php
@@ -34,25 +34,25 @@ class ACIDTest extends Scope
         $this->assertEquals(201, $database['headers']['status-code']);
         $databaseId = $database['body']['$id'];
 
-        // Create collection with unique constraint
-        $collection = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+        // Create table with unique constraint
+        $table = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'AtomicityTest',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Add unique column
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -63,7 +63,7 @@ class ACIDTest extends Scope
         ]);
 
         // Add unique index
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/indexes', array_merge([
+        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/indexes', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -75,12 +75,12 @@ class ACIDTest extends Scope
 
         sleep(3);
 
-        // Create first document outside transaction
-        $doc1 = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create first row outside transaction
+        $doc1 = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'documentId' => ID::unique(),
+            'rowId' => ID::unique(),
             'data' => [
                 'email' => 'existing@example.com'
             ]
@@ -108,27 +108,27 @@ class ACIDTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => [
                         'email' => 'newuser@example.com' // This should succeed
                     ]
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => [
                         'email' => 'existing@example.com' // This will fail - duplicate
                     ]
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => [
                         'email' => 'anotheruser@example.com' // This should not be created due to atomicity
                     ]
@@ -148,26 +148,26 @@ class ACIDTest extends Scope
         ]);
 
         if ($response['headers']['status-code'] === 200) {
-            // If transaction succeeded, all documents should be created
-            $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            // If transaction succeeded, all rows should be created
+            $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
 
-            // Should have 4 documents total (1 original + 3 from transaction)
+            // Should have 4 rows total (1 original + 3 from transaction)
             // But since we have a unique constraint violation, this might fail
-            $this->assertGreaterThanOrEqual(1, $documents['body']['total']);
+            $this->assertGreaterThanOrEqual(1, $rows['body']['total']);
         } else {
             $this->assertEquals(409, $response['headers']['status-code']); // Conflict error
 
-            // Verify NO new documents were created (atomicity)
-            $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            // Verify NO new rows were created (atomicity)
+            $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
 
-            $this->assertEquals(1, $documents['body']['total']); // Only the original document
-            $this->assertEquals('existing@example.com', $documents['body']['documents'][0]['email']);
+            $this->assertEquals(1, $rows['body']['total']); // Only the original row
+            $this->assertEquals('existing@example.com', $rows['body']['rows'][0]['email']);
         }
     }
 
@@ -189,25 +189,25 @@ class ACIDTest extends Scope
         $this->assertEquals(201, $database['headers']['status-code']);
         $databaseId = $database['body']['$id'];
 
-        // Create collection with required fields and constraints
-        $collection = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+        // Create table with required fields and constraints
+        $table = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'ConsistencyTest',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Add required string column
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -218,7 +218,7 @@ class ACIDTest extends Scope
         ]);
 
         // Add integer column with min/max constraints
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/integer', array_merge([
+        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -249,9 +249,9 @@ class ACIDTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => [
                         'required_field' => 'Valid User',
                         'age' => 25 // Valid age
@@ -259,9 +259,9 @@ class ACIDTest extends Scope
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => [
                         'required_field' => 'Too Young User',
                         'age' => 10 // Below minimum - will fail constraint
@@ -269,9 +269,9 @@ class ACIDTest extends Scope
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => [
                         'required_field' => 'Another Valid User',
                         'age' => 30 // Valid but should not be created due to transaction failure
@@ -293,13 +293,13 @@ class ACIDTest extends Scope
 
         $this->assertContains($response['headers']['status-code'], [400, 500], 'Transaction commit should fail due to validation. Response: ' . json_encode($response['body']));
 
-        // Verify no documents were created
-        $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Verify no rows were created
+        $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(0, $documents['body']['total']);
+        $this->assertEquals(0, $rows['body']['total']);
     }
 
     /**
@@ -320,15 +320,15 @@ class ACIDTest extends Scope
         $this->assertEquals(201, $database['headers']['status-code']);
         $databaseId = $database['body']['$id'];
 
-        // Create collection
-        $collection = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+        // Create table
+        $table = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'IsolationTest',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
@@ -336,10 +336,10 @@ class ACIDTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Add counter column
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/integer', array_merge([
+        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/integer', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -352,12 +352,12 @@ class ACIDTest extends Scope
 
         sleep(2);
 
-        // Create initial document with counter
-        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create initial row with counter
+        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
-            'documentId' => 'shared_counter',
+            'rowId' => 'shared_counter',
             'data' => [
                 'counter' => 0
             ]
@@ -396,8 +396,8 @@ class ACIDTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
-                    'documentId' => 'shared_counter',
+                    'tableId' => $tableId,
+                    'rowId' => 'shared_counter',
                     'action' => 'increment',
                     'data' => [
                         'column' => 'counter',
@@ -416,8 +416,8 @@ class ACIDTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
-                    'documentId' => 'shared_counter',
+                    'tableId' => $tableId,
+                    'rowId' => 'shared_counter',
                     'action' => 'increment',
                     'data' => [
                         'column' => 'counter',
@@ -450,13 +450,13 @@ class ACIDTest extends Scope
         $this->assertEquals(200, $response2['headers']['status-code']);
 
         // Check final value - both increments should be applied
-        $document = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/shared_counter", array_merge([
+        $row = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/shared_counter", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         // Both increments should be applied: 0 + 10 + 5 = 15
-        $this->assertEquals(15, $document['body']['counter']);
+        $this->assertEquals(15, $row['body']['counter']);
     }
 
     /**
@@ -477,15 +477,15 @@ class ACIDTest extends Scope
         $this->assertEquals(201, $database['headers']['status-code']);
         $databaseId = $database['body']['$id'];
 
-        // Create collection
-        $collection = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+        // Create table
+        $table = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'DurabilityTest',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
@@ -494,10 +494,10 @@ class ACIDTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Add column
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -529,27 +529,27 @@ class ACIDTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'durable_doc_1',
+                    'rowId' => 'durable_doc_1',
                     'data' => [
                         'data' => 'Important data 1'
                     ]
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'durable_doc_2',
+                    'rowId' => 'durable_doc_2',
                     'data' => [
                         'data' => 'Important data 2'
                     ]
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'update',
-                    'documentId' => 'durable_doc_1',
+                    'rowId' => 'durable_doc_1',
                     'data' => [
                         'data' => 'Updated important data 1'
                     ]
@@ -569,33 +569,33 @@ class ACIDTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code'], 'Commit should succeed. Response: ' . json_encode($response['body']));
         $this->assertEquals('committed', $response['body']['status']);
 
-        // List all documents to see what was created
-        $allDocs = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // List all rows to see what was created
+        $allDocs = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertGreaterThan(0, $allDocs['body']['total'], 'Should have created documents. Found: ' . json_encode($allDocs['body']));
+        $this->assertGreaterThan(0, $allDocs['body']['total'], 'Should have created rows. Found: ' . json_encode($allDocs['body']));
 
-        // Verify documents exist and have correct data
-        $document1 = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/durable_doc_1", array_merge([
+        // Verify rows exist and have correct data
+        $row1 = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/durable_doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(200, $document1['headers']['status-code']);
-        $this->assertEquals('Updated important data 1', $document1['body']['data']);
+        $this->assertEquals(200, $row1['headers']['status-code']);
+        $this->assertEquals('Updated important data 1', $row1['body']['data']);
 
-        $document2 = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/durable_doc_2", array_merge([
+        $row2 = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/durable_doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(200, $document2['headers']['status-code']);
-        $this->assertEquals('Important data 2', $document2['body']['data']);
+        $this->assertEquals(200, $row2['headers']['status-code']);
+        $this->assertEquals('Important data 2', $row2['body']['data']);
 
         // Further update outside transaction to ensure persistence
-        $update = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/durable_doc_1", array_merge([
+        $update = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/durable_doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -607,19 +607,19 @@ class ACIDTest extends Scope
         $this->assertEquals(200, $update['headers']['status-code']);
 
         // Verify the update persisted
-        $document1 = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/durable_doc_1", array_merge([
+        $row1 = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/durable_doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals('Modified outside transaction', $document1['body']['data']);
+        $this->assertEquals('Modified outside transaction', $row1['body']['data']);
 
-        // List all documents to verify total count
-        $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // List all rows to verify total count
+        $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(2, $documents['body']['total']);
+        $this->assertEquals(2, $rows['body']['total']);
     }
 }
diff --git a/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsTest.php b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsTest.php
index affe44b662..c19100e7ed 100644
--- a/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsTest.php
+++ b/tests/e2e/Services/Databases/TablesDB/Transactions/TransactionsTest.php
@@ -121,15 +121,15 @@ class TransactionsTest extends Scope
         $this->assertEquals(201, $transaction['headers']['status-code']);
         $transactionId = $transaction['body']['$id'];
 
-        // Create a collection for testing
-        $collection = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+        // Create a table for testing
+        $table = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TransactionOperationsTest',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
@@ -138,11 +138,11 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $this->assertEquals(201, $collection['headers']['status-code']);
-        $collectionId = $collection['body']['$id'];
+        $this->assertEquals(201, $table['headers']['status-code']);
+        $tableId = $table['body']['$id'];
 
         // Add columns
-        $column = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/string', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -166,18 +166,18 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'doc1',
+                    'rowId' => 'doc1',
                     'data' => [
                         'name' => 'Test Document 1'
                     ]
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'doc2',
+                    'rowId' => 'doc2',
                     'data' => [
                         'name' => 'Test Document 2'
                     ]
@@ -197,9 +197,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'update',
-                    'documentId' => 'doc1',
+                    'rowId' => 'doc1',
                     'data' => [
                         'name' => 'Updated Document 1'
                     ]
@@ -219,9 +219,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => 'invalid_database',
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['name' => 'Test']
                 ]
             ]
@@ -229,7 +229,7 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(404, $response['headers']['status-code'], 'Invalid database should return 404. Got: ' . json_encode($response['body']));
 
-        // Test invalid collection ID
+        // Test invalid table ID
         $response = $this->client->call(Client::METHOD_POST, "/tablesdb/transactions/{$transactionId}/operations", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -238,9 +238,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => 'invalid_collection',
+                    'tableId' => 'invalid_table',
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['name' => 'Test']
                 ]
             ]
@@ -267,15 +267,15 @@ class TransactionsTest extends Scope
         $this->assertEquals(201, $database['headers']['status-code']);
         $databaseId = $database['body']['$id'];
 
-        // Create collection
-        $collection = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+        // Create table
+        $table = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TransactionCommitTest',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
@@ -284,11 +284,11 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $this->assertEquals(201, $collection['headers']['status-code']);
-        $collectionId = $collection['body']['$id'];
+        $this->assertEquals(201, $table['headers']['status-code']);
+        $tableId = $table['body']['$id'];
 
         // Add columns
-        $column = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/string', array_merge([
+        $column = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -320,27 +320,27 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'doc1',
+                    'rowId' => 'doc1',
                     'data' => [
                         'name' => 'Test Document 1'
                     ]
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'doc2',
+                    'rowId' => 'doc2',
                     'data' => [
                         'name' => 'Test Document 2'
                     ]
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'update',
-                    'documentId' => 'doc1',
+                    'rowId' => 'doc1',
                     'data' => [
                         'name' => 'Updated Document 1'
                     ]
@@ -363,18 +363,18 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals('committed', $response['body']['status']);
 
-        // Verify documents were created
-        $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Verify rows were created
+        $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(200, $documents['headers']['status-code']);
-        $this->assertEquals(2, $documents['body']['total']);
+        $this->assertEquals(200, $rows['headers']['status-code']);
+        $this->assertEquals(2, $rows['body']['total']);
 
         // Verify the update was applied
         $doc1Found = false;
-        foreach ($documents['body']['documents'] as $doc) {
+        foreach ($rows['body']['rows'] as $doc) {
             if ($doc['$id'] === 'doc1') {
                 $this->assertEquals('Updated Document 1', $doc['name']);
                 $doc1Found = true;
@@ -422,15 +422,15 @@ class TransactionsTest extends Scope
         $this->assertEquals(201, $transaction['headers']['status-code']);
         $transactionId = $transaction['body']['$id'];
 
-        // Create a collection for rollback test
-        $collection = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
+        // Create a table for rollback test
+        $table = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TransactionRollbackTest',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
@@ -439,10 +439,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Add column
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $collectionId . '/columns/string', array_merge([
+        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $tableId . '/columns/string', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -463,9 +463,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'rollback_doc',
+                    'rowId' => 'rollback_doc',
                     'data' => [
                         'value' => 'Should not exist'
                     ]
@@ -487,14 +487,14 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals('rolledBack', $response['body']['status']);
 
-        // Verify no documents were created
-        $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Verify no rows were created
+        $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(200, $documents['headers']['status-code']);
-        $this->assertEquals(0, $documents['body']['total']);
+        $this->assertEquals(200, $rows['headers']['status-code']);
+        $this->assertEquals(0, $rows['body']['total']);
     }
 
     /**
@@ -502,7 +502,7 @@ class TransactionsTest extends Scope
      */
     public function testTransactionExpiration(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -514,12 +514,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -529,10 +529,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -565,9 +565,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['data' => 'Should expire']
                 ]
             ]
@@ -598,7 +598,7 @@ class TransactionsTest extends Scope
      */
     public function testTransactionSizeLimit(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -610,20 +610,20 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [Permission::create(Role::any())],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -650,9 +650,9 @@ class TransactionsTest extends Scope
         for ($i = 0; $i < 50; $i++) {
             $operations[] = [
                 'databaseId' => $databaseId,
-                'collectionId' => $collectionId,
+                'tableId' => $tableId,
                 'action' => 'create',
-                'documentId' => 'doc_' . $i,
+                'rowId' => 'doc_' . $i,
                 'data' => ['value' => 'Test ' . $i]
             ];
         }
@@ -674,8 +674,8 @@ class TransactionsTest extends Scope
         for ($i = 50; $i < 100; $i++) {
             $operations[] = [
                 'databaseId' => $databaseId,
-                'collectionId' => $collectionId,
-                'documentId' => 'doc_' . $i,
+                'tableId' => $tableId,
+                'rowId' => 'doc_' . $i,
                 'action' => 'create',
                 'data' => ['value' => 'Test ' . $i]
             ];
@@ -701,9 +701,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'doc_overflow',
+                    'rowId' => 'doc_overflow',
                     'data' => ['value' => 'This should fail']
                 ]
             ]
@@ -717,7 +717,7 @@ class TransactionsTest extends Scope
      */
     public function testConcurrentTransactionConflicts(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -729,12 +729,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -743,10 +743,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/integer", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/integer", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -759,13 +759,13 @@ class TransactionsTest extends Scope
 
         sleep(2);
 
-        // Create initial document
-        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create initial row
+        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'shared_doc',
+            'rowId' => 'shared_doc',
             'data' => ['counter' => 100]
         ]);
 
@@ -787,7 +787,7 @@ class TransactionsTest extends Scope
         $transactionId1 = $txn1['body']['$id'];
         $transactionId2 = $txn2['body']['$id'];
 
-        // Both transactions try to update the same document
+        // Both transactions try to update the same row
         $this->client->call(Client::METHOD_POST, "/tablesdb/transactions/{$transactionId1}/operations", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -796,9 +796,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'update',
-                    'documentId' => 'shared_doc',
+                    'rowId' => 'shared_doc',
                     'data' => ['counter' => 200]
                 ]
             ]
@@ -812,9 +812,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'update',
-                    'documentId' => 'shared_doc',
+                    'rowId' => 'shared_doc',
                     'data' => ['counter' => 300]
                 ]
             ]
@@ -842,8 +842,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(409, $response2['headers']['status-code']); // Conflict
 
-        // Verify the document has the value from first transaction
-        $doc = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/shared_doc", array_merge([
+        // Verify the row has the value from first transaction
+        $doc = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/shared_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -852,11 +852,11 @@ class TransactionsTest extends Scope
     }
 
     /**
-     * Test deleting a document that's being updated in a transaction
+     * Test deleting a row that's being updated in a transaction
      */
     public function testDeleteDocumentDuringTransaction(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -868,12 +868,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -883,10 +883,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -898,13 +898,13 @@ class TransactionsTest extends Scope
 
         sleep(2);
 
-        // Create document
-        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create row
+        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'target_doc',
+            'rowId' => 'target_doc',
             'data' => ['data' => 'Original']
         ]);
 
@@ -928,16 +928,16 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'update',
-                    'documentId' => 'target_doc',
+                    'rowId' => 'target_doc',
                     'data' => ['data' => 'Updated in transaction']
                 ]
             ]
         ]);
 
-        // Delete the document outside of transaction
-        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/target_doc", array_merge([
+        // Delete the row outside of transaction
+        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/target_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -945,7 +945,7 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(204, $response['headers']['status-code']);
 
-        // Try to commit transaction - should fail because document no longer exists
+        // Try to commit transaction - should fail because row no longer exists
         $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/transactions/{$transactionId}", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -962,7 +962,7 @@ class TransactionsTest extends Scope
      */
     public function testBulkOperations(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -974,12 +974,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -989,10 +989,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1002,7 +1002,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1014,14 +1014,14 @@ class TransactionsTest extends Scope
 
         sleep(3);
 
-        // Create some initial documents
+        // Create some initial rows
         for ($i = 1; $i <= 5; $i++) {
-            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                'documentId' => 'existing_' . $i,
+                'rowId' => 'existing_' . $i,
                 'data' => [
                     'name' => 'Existing ' . $i,
                     'category' => 'old'
@@ -1048,7 +1048,7 @@ class TransactionsTest extends Scope
                 // Bulk create
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'bulkCreate',
                     'data' => [
                         ['$id' => 'bulk_1', 'name' => 'Bulk 1', 'category' => 'new'],
@@ -1059,7 +1059,7 @@ class TransactionsTest extends Scope
                 // Bulk update
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'bulkUpdate',
                     'data' => [
                         'queries' => [Query::equal('category', ['old'])->toString()],
@@ -1069,7 +1069,7 @@ class TransactionsTest extends Scope
                 // Bulk delete
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'bulkDelete',
                     'data' => [
                         'queries' => [Query::equal('name', ['Existing 5'])->toString()]
@@ -1092,20 +1092,20 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Verify results
-        $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        // Should have 7 documents (5 existing - 1 deleted + 3 new)
-        $this->assertEquals(7, $documents['body']['total']);
+        // Should have 7 rows (5 existing - 1 deleted + 3 new)
+        $this->assertEquals(7, $rows['body']['total']);
 
         // Check categories were updated
         $oldCategoryCount = 0;
         $updatedCategoryCount = 0;
         $newCategoryCount = 0;
 
-        foreach ($documents['body']['documents'] as $doc) {
+        foreach ($rows['body']['rows'] as $doc) {
             switch ($doc['category']) {
                 case 'old':
                     $oldCategoryCount++;
@@ -1129,7 +1129,7 @@ class TransactionsTest extends Scope
      */
     public function testPartialFailureRollback(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1141,12 +1141,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -1154,10 +1154,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns with constraints
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1170,7 +1170,7 @@ class TransactionsTest extends Scope
         sleep(2);
 
         // Create unique index on email
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/indexes", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/indexes", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1182,13 +1182,13 @@ class TransactionsTest extends Scope
 
         sleep(2);
 
-        // Create an existing document
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create an existing row
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => ID::unique(),
+            'rowId' => ID::unique(),
             'data' => ['email' => 'existing@example.com']
         ]);
 
@@ -1210,30 +1210,30 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['email' => 'valid1@example.com'] // Valid
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['email' => 'valid2@example.com'] // Valid
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['email' => 'existing@example.com'] // Will fail - duplicate
                 ],
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['email' => 'valid3@example.com'] // Would be valid but should rollback
                 ],
             ]
@@ -1252,14 +1252,14 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(409, $response['headers']['status-code']); // Conflict due to duplicate
 
-        // Verify NO new documents were created (atomicity)
-        $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Verify NO new rows were created (atomicity)
+        $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(1, $documents['body']['total']); // Only the original document
-        $this->assertEquals('existing@example.com', $documents['body']['documents'][0]['email']);
+        $this->assertEquals(1, $rows['body']['total']); // Only the original row
+        $this->assertEquals('existing@example.com', $rows['body']['rows'][0]['email']);
     }
 
     /**
@@ -1267,7 +1267,7 @@ class TransactionsTest extends Scope
      */
     public function testDoubleCommitRollback(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1279,20 +1279,20 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [Permission::create(Role::any())],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1322,9 +1322,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => ID::unique(),
+                    'rowId' => ID::unique(),
                     'data' => ['data' => 'Test']
                 ]
             ]
@@ -1385,11 +1385,11 @@ class TransactionsTest extends Scope
     }
 
     /**
-     * Test operations on non-existent documents
+     * Test operations on non-existent rows
      */
     public function testOperationsOnNonExistentDocuments(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1401,12 +1401,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -1415,10 +1415,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1439,7 +1439,7 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Try to update non-existent document
+        // Try to update non-existent row
         $response = $this->client->call(Client::METHOD_POST, "/tablesdb/transactions/{$transactionId}/operations", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1448,9 +1448,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'update',
-                    'documentId' => 'non_existent_doc',
+                    'rowId' => 'non_existent_doc',
                     'data' => ['data' => 'Should fail']
                 ]
             ]
@@ -1469,7 +1469,7 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(404, $response['headers']['status-code']); // Document not found
 
-        // Test delete non-existent document
+        // Test delete non-existent row
         $transaction2 = $this->client->call(Client::METHOD_POST, '/tablesdb/transactions', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1486,9 +1486,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'delete',
-                    'documentId' => 'non_existent_doc',
+                    'rowId' => 'non_existent_doc',
                     'data' => []
                 ]
             ]
@@ -1513,7 +1513,7 @@ class TransactionsTest extends Scope
      */
     public function testCreateDocument(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1525,14 +1525,14 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
-            'documentSecurity' => false,
+            'rowSecurity' => false,
             'permissions' => [
                 Permission::create(Role::any()),
                 Permission::read(Role::any()),
@@ -1541,7 +1541,7 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
         $columns = [
@@ -1555,7 +1555,7 @@ class TransactionsTest extends Scope
             $type = $attr['type'];
             unset($attr['type']);
 
-            $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/{$type}", array_merge([
+            $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/{$type}", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1576,13 +1576,13 @@ class TransactionsTest extends Scope
         $this->assertEquals(201, $transaction['headers']['status-code']);
         $transactionId = $transaction['body']['$id'];
 
-        // Create document via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create row via normal route with transactionId
+        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'doc_from_route',
+            'rowId' => 'doc_from_route',
             'data' => [
                 'name' => 'Created via normal route',
                 'counter' => 100,
@@ -1594,7 +1594,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
 
         // Document should not exist outside transaction yet
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_from_route", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_from_route", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1613,7 +1613,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Document should now exist
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_from_route", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_from_route", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1627,7 +1627,7 @@ class TransactionsTest extends Scope
      */
     public function testUpdateDocument(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1639,12 +1639,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -1653,10 +1653,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1666,7 +1666,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/integer", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/integer", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1677,7 +1677,7 @@ class TransactionsTest extends Scope
             'max' => 10000,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1689,13 +1689,13 @@ class TransactionsTest extends Scope
 
         sleep(3);
 
-        // Create document outside transaction
-        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create row outside transaction
+        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'doc_to_update',
+            'rowId' => 'doc_to_update',
             'data' => [
                 'name' => 'Original name',
                 'counter' => 50,
@@ -1714,8 +1714,8 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Update document via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_to_update", array_merge([
+        // Update row via normal route with transactionId
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_to_update", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1731,7 +1731,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Document should still have original values outside transaction
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_to_update", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_to_update", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1751,7 +1751,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Document should now have updated values
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_to_update", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_to_update", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1765,7 +1765,7 @@ class TransactionsTest extends Scope
      */
     public function testUpsertDocument(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1777,12 +1777,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -1791,10 +1791,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1804,7 +1804,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/integer", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/integer", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1826,13 +1826,13 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Upsert document (create) via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_upsert", array_merge([
+        // Upsert row (create) via normal route with transactionId
+        $response = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_upsert", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'doc_upsert',
+            'rowId' => 'doc_upsert',
             'data' => [
                 'name' => 'Created by upsert',
                 'counter' => 25
@@ -1843,20 +1843,20 @@ class TransactionsTest extends Scope
         $this->assertEquals(201, $response['headers']['status-code']);
 
         // Document should not exist outside transaction yet
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_upsert", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_upsert", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals(404, $response['headers']['status-code']);
 
-        // Upsert same document (update) in same transaction
-        $response = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_upsert", array_merge([
+        // Upsert same row (update) in same transaction
+        $response = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_upsert", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'doc_upsert',
+            'rowId' => 'doc_upsert',
             'data' => [
                 'name' => 'Updated by upsert',
                 'counter' => 75
@@ -1878,7 +1878,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Document should now exist with updated values
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_upsert", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_upsert", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1893,7 +1893,7 @@ class TransactionsTest extends Scope
      */
     public function testDeleteDocument(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -1905,12 +1905,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -1919,10 +1919,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1934,13 +1934,13 @@ class TransactionsTest extends Scope
 
         sleep(2);
 
-        // Create document outside transaction
-        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create row outside transaction
+        $doc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'doc_to_delete',
+            'rowId' => 'doc_to_delete',
             'data' => ['name' => 'Will be deleted']
         ]);
 
@@ -1955,8 +1955,8 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Delete document via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_to_delete", array_merge([
+        // Delete row via normal route with transactionId
+        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_to_delete", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -1967,7 +1967,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(204, $response['headers']['status-code']);
 
         // Document should still exist outside transaction
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_to_delete", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_to_delete", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1986,7 +1986,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Document should no longer exist
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_to_delete", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_to_delete", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -1999,7 +1999,7 @@ class TransactionsTest extends Scope
      */
     public function testBulkCreate(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2011,12 +2011,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -2024,10 +2024,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2037,7 +2037,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2059,12 +2059,12 @@ class TransactionsTest extends Scope
         $transactionId = $transaction['body']['$id'];
 
         // Bulk create via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documents' => [
+            'rows' => [
                 [
                     '$id' => 'bulk_create_1',
                     'name' => 'Bulk created 1',
@@ -2087,7 +2087,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']); // Bulk operations return 200
 
         // Documents should not exist outside transaction yet
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2096,8 +2096,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(0, $response['body']['total']);
 
-        // Individual document check
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/bulk_create_1", array_merge([
+        // Individual row check
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/bulk_create_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2116,7 +2116,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Documents should now exist
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2125,9 +2125,9 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(3, $response['body']['total']);
 
-        // Verify individual documents
+        // Verify individual rows
         for ($i = 1; $i <= 3; $i++) {
-            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/bulk_create_{$i}", array_merge([
+            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/bulk_create_{$i}", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
@@ -2143,7 +2143,7 @@ class TransactionsTest extends Scope
      */
     public function testBulkUpdate(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2155,12 +2155,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -2169,10 +2169,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2182,7 +2182,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2194,14 +2194,14 @@ class TransactionsTest extends Scope
 
         sleep(3);
 
-        // Create documents for bulk testing
+        // Create rows for bulk testing
         for ($i = 1; $i <= 3; $i++) {
-            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                'documentId' => 'bulk_update_' . $i,
+                'rowId' => 'bulk_update_' . $i,
                 'data' => [
                     'name' => 'Bulk doc ' . $i,
                     'category' => 'bulk_test'
@@ -2219,7 +2219,7 @@ class TransactionsTest extends Scope
         $transactionId = $transaction['body']['$id'];
 
         // Bulk update via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2232,7 +2232,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Documents should still have original category outside transaction
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2253,7 +2253,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Documents should now have updated category
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2268,7 +2268,7 @@ class TransactionsTest extends Scope
      */
     public function testBulkUpsert(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2280,12 +2280,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -2294,10 +2294,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2307,7 +2307,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/integer", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/integer", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2320,13 +2320,13 @@ class TransactionsTest extends Scope
 
         sleep(3);
 
-        // Create one document outside transaction
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create one row outside transaction
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'bulk_upsert_existing',
+            'rowId' => 'bulk_upsert_existing',
             'data' => [
                 'name' => 'Existing doc',
                 'counter' => 10
@@ -2343,12 +2343,12 @@ class TransactionsTest extends Scope
         $transactionId = $transaction['body']['$id'];
 
         // Bulk upsert via normal route with transactionId (updates existing, creates new)
-        $response = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documents' => [
+            'rows' => [
                 [
                     '$id' => 'bulk_upsert_existing',
                     'name' => 'Updated existing',
@@ -2365,8 +2365,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Original document should be unchanged, new document shouldn't exist outside transaction
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/bulk_upsert_existing", array_merge([
+        // Original row should be unchanged, new row shouldn't exist outside transaction
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/bulk_upsert_existing", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2374,7 +2374,7 @@ class TransactionsTest extends Scope
         $this->assertEquals('Existing doc', $response['body']['name']);
         $this->assertEquals(10, $response['body']['counter']);
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/bulk_upsert_new", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/bulk_upsert_new", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2392,8 +2392,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Check both documents exist with updated values
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/bulk_upsert_existing", array_merge([
+        // Check both rows exist with updated values
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/bulk_upsert_existing", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2401,7 +2401,7 @@ class TransactionsTest extends Scope
         $this->assertEquals('Updated existing', $response['body']['name']);
         $this->assertEquals(20, $response['body']['counter']);
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/bulk_upsert_new", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/bulk_upsert_new", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2415,7 +2415,7 @@ class TransactionsTest extends Scope
      */
     public function testBulkDelete(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2427,12 +2427,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -2441,10 +2441,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2454,7 +2454,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2466,14 +2466,14 @@ class TransactionsTest extends Scope
 
         sleep(3);
 
-        // Create documents for bulk testing
+        // Create rows for bulk testing
         for ($i = 1; $i <= 3; $i++) {
-            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                'documentId' => 'bulk_delete_' . $i,
+                'rowId' => 'bulk_delete_' . $i,
                 'data' => [
                     'name' => 'Delete doc ' . $i,
                     'category' => 'bulk_delete_test'
@@ -2491,7 +2491,7 @@ class TransactionsTest extends Scope
         $transactionId = $transaction['body']['$id'];
 
         // Bulk delete via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2503,7 +2503,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']); // Bulk delete with transaction returns 200
 
         // Documents should still exist outside transaction
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2524,7 +2524,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
 
         // Documents should now be deleted
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()), [
@@ -2539,7 +2539,7 @@ class TransactionsTest extends Scope
      */
     public function testMixedSingleOperations(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2551,12 +2551,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -2566,10 +2566,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2579,7 +2579,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2589,7 +2589,7 @@ class TransactionsTest extends Scope
             'required' => false,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/integer", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/integer", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2602,13 +2602,13 @@ class TransactionsTest extends Scope
 
         sleep(3);
 
-        // Create an existing document outside transaction for testing
-        $existingDoc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Create an existing row outside transaction for testing
+        $existingDoc = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'existing_doc',
+            'rowId' => 'existing_doc',
             'data' => [
                 'name' => 'Existing Document',
                 'status' => 'active',
@@ -2628,13 +2628,13 @@ class TransactionsTest extends Scope
         $transactionId = $transaction['body']['$id'];
         $this->assertEquals(201, $transaction['headers']['status-code']);
 
-        // 1. Create new document via normal route with transactionId
-        $response1 = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // 1. Create new row via normal route with transactionId
+        $response1 = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'new_doc_1',
+            'rowId' => 'new_doc_1',
             'data' => [
                 'name' => 'New Document 1',
                 'status' => 'pending',
@@ -2645,13 +2645,13 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(201, $response1['headers']['status-code']);
 
-        // 2. Create another document via normal route with transactionId
-        $response2 = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // 2. Create another row via normal route with transactionId
+        $response2 = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'new_doc_2',
+            'rowId' => 'new_doc_2',
             'data' => [
                 'name' => 'New Document 2',
                 'status' => 'pending',
@@ -2662,8 +2662,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(201, $response2['headers']['status-code']);
 
-        // 3. Update existing document via normal route with transactionId
-        $response3 = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/existing_doc", array_merge([
+        // 3. Update existing row via normal route with transactionId
+        $response3 = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/existing_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2677,8 +2677,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response3['headers']['status-code']);
 
-        // 4. Update the first new document (created in same transaction)
-        $response4 = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/new_doc_1", array_merge([
+        // 4. Update the first new row (created in same transaction)
+        $response4 = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/new_doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2692,8 +2692,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response4['headers']['status-code']);
 
-        // 5. Delete the second new document (created in same transaction)
-        $response5 = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/new_doc_2", array_merge([
+        // 5. Delete the second new row (created in same transaction)
+        $response5 = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/new_doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2703,13 +2703,13 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(204, $response5['headers']['status-code']);
 
-        // 6. Upsert a new document via normal route with transactionId
-        $response6 = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/upserted_doc", array_merge([
+        // 6. Upsert a new row via normal route with transactionId
+        $response6 = $this->client->call(Client::METHOD_PUT, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/upserted_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'upserted_doc',
+            'rowId' => 'upserted_doc',
             'data' => [
                 'name' => 'Upserted Document',
                 'status' => 'new',
@@ -2731,14 +2731,14 @@ class TransactionsTest extends Scope
         $this->assertEquals(6, $txnDetails['body']['operations']); // 6 operations total
 
         // Verify nothing exists outside transaction yet
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/new_doc_1", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/new_doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals(404, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/upserted_doc", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/upserted_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2746,7 +2746,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(404, $response['headers']['status-code']);
 
         // Existing doc should still have original values
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/existing_doc", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/existing_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2768,7 +2768,7 @@ class TransactionsTest extends Scope
 
         // Verify final state after commit
         // new_doc_1 should exist with updated values
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/new_doc_1", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/new_doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2779,7 +2779,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(8, $response['body']['priority']);
 
         // new_doc_2 should not exist (was deleted in transaction)
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/new_doc_2", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/new_doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2787,7 +2787,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(404, $response['headers']['status-code']);
 
         // existing_doc should have updated values
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/existing_doc", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/existing_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2796,7 +2796,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(10, $response['body']['priority']);
 
         // upserted_doc should exist
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/upserted_doc", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/upserted_doc", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2806,13 +2806,13 @@ class TransactionsTest extends Scope
         $this->assertEquals('new', $response['body']['status']);
         $this->assertEquals(3, $response['body']['priority']);
 
-        // Verify total document count
-        $documents = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Verify total row count
+        $rows = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(3, $documents['body']['total']); // existing_doc, new_doc_1, upserted_doc
+        $this->assertEquals(3, $rows['body']['total']); // existing_doc, new_doc_1, upserted_doc
     }
 
     /**
@@ -2820,7 +2820,7 @@ class TransactionsTest extends Scope
      */
     public function testMixedOperations(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2832,12 +2832,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::create(Role::any()),
@@ -2847,10 +2847,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create column
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -2880,9 +2880,9 @@ class TransactionsTest extends Scope
             'operations' => [
                 [
                     'databaseId' => $databaseId,
-                    'collectionId' => $collectionId,
+                    'tableId' => $tableId,
                     'action' => 'create',
-                    'documentId' => 'mixed_doc1',
+                    'rowId' => 'mixed_doc1',
                     'data' => ['name' => 'Via Operations Add']
                 ]
             ]
@@ -2892,12 +2892,12 @@ class TransactionsTest extends Scope
         $this->assertEquals(1, $response['body']['operations']);
 
         // Add operation via normal route with transactionId
-        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'mixed_doc2',
+            'rowId' => 'mixed_doc2',
             'data' => ['name' => 'Via normal route'],
             'transactionId' => $transactionId
         ]);
@@ -2913,15 +2913,15 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(2, $txnDetails['body']['operations']);
 
-        // Both documents shouldn't exist yet
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/mixed_doc1", array_merge([
+        // Both rows shouldn't exist yet
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/mixed_doc1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals(404, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/mixed_doc2", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/mixed_doc2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2939,8 +2939,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Both documents should now exist
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/mixed_doc1", array_merge([
+        // Both rows should now exist
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/mixed_doc1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2948,7 +2948,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals('Via Operations Add', $response['body']['name']);
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/mixed_doc2", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/mixed_doc2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -2958,11 +2958,11 @@ class TransactionsTest extends Scope
     }
 
     /**
-     * Test bulk update with queries that should match documents created in the same transaction
+     * Test bulk update with queries that should match rows created in the same transaction
      */
     public function testBulkUpdateWithTransactionAwareQueries(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -2974,12 +2974,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -2989,10 +2989,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3002,7 +3002,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/integer", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/integer", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3011,7 +3011,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3023,14 +3023,14 @@ class TransactionsTest extends Scope
 
         sleep(3); // Wait for columns to be created
 
-        // Create some existing documents
+        // Create some existing rows
         for ($i = 1; $i <= 3; $i++) {
-            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                'documentId' => 'existing_' . $i,
+                'rowId' => 'existing_' . $i,
                 'data' => [
                     'name' => 'Existing ' . $i,
                     'age' => 20 + $i,
@@ -3048,13 +3048,13 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Step 1: Create new documents with age > 25 in transaction
-        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Step 1: Create new rows with age > 25 in transaction
+        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'txn_doc_1',
+            'rowId' => 'txn_doc_1',
             'data' => [
                 'name' => 'Transaction Doc 1',
                 'age' => 30,
@@ -3065,12 +3065,12 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(201, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'txn_doc_2',
+            'rowId' => 'txn_doc_2',
             'data' => [
                 'name' => 'Transaction Doc 2',
                 'age' => 35,
@@ -3081,10 +3081,10 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(201, $response['headers']['status-code']);
 
-        // Step 2: Bulk update all documents with age > 25 to have status 'active'
-        // This should match both existing_3 (age=23 doesn't match, age=24 doesn't match, but existing documents have age 21,22,23)
+        // Step 2: Bulk update all rows with age > 25 to have status 'active'
+        // This should match both existing_3 (age=23 doesn't match, age=24 doesn't match, but existing rows have age 21,22,23)
         // Wait, let me fix the ages - existing docs have ages 21, 22, 23, so only txn docs should match
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3109,8 +3109,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Verify that documents created in the transaction were updated by the bulk update
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/txn_doc_1", array_merge([
+        // Verify that rows created in the transaction were updated by the bulk update
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/txn_doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3118,7 +3118,7 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals('active', $response['body']['status'], 'Document created in transaction should be updated by bulk update query');
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/txn_doc_2", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/txn_doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3126,24 +3126,24 @@ class TransactionsTest extends Scope
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals('active', $response['body']['status'], 'Document created in transaction should be updated by bulk update query');
 
-        // Verify existing documents were not affected
+        // Verify existing rows were not affected
         for ($i = 1; $i <= 3; $i++) {
-            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/existing_{$i}", array_merge([
+            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/existing_{$i}", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
 
             $this->assertEquals(200, $response['headers']['status-code']);
-            $this->assertEquals('inactive', $response['body']['status'], "Existing document {$i} should remain inactive (age <= 25)");
+            $this->assertEquals('inactive', $response['body']['status'], "Existing row {$i} should remain inactive (age <= 25)");
         }
     }
 
     /**
-     * Test bulk update with queries that should match documents updated in the same transaction
+     * Test bulk update with queries that should match rows updated in the same transaction
      */
     public function testBulkUpdateMatchingUpdatedDocuments(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -3155,12 +3155,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -3170,10 +3170,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3183,7 +3183,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3193,7 +3193,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3205,14 +3205,14 @@ class TransactionsTest extends Scope
 
         sleep(3); // Wait for columns to be created
 
-        // Create existing documents
+        // Create existing rows
         for ($i = 1; $i <= 4; $i++) {
-            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                'documentId' => 'doc_' . $i,
+                'rowId' => 'doc_' . $i,
                 'data' => [
                     'name' => 'Document ' . $i,
                     'category' => 'normal',
@@ -3230,8 +3230,8 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Step 1: Update some documents to have category 'special' in transaction
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_1", array_merge([
+        // Step 1: Update some rows to have category 'special' in transaction
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3244,7 +3244,7 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_2", array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3257,9 +3257,9 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Step 2: Bulk update all documents with category 'special' to have priority 'high'
-        // This should match the documents we just updated in the transaction
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Step 2: Bulk update all rows with category 'special' to have priority 'high'
+        // This should match the rows we just updated in the transaction
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3284,8 +3284,8 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Verify that the updated documents were matched by bulk update
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_1", array_merge([
+        // Verify that the updated rows were matched by bulk update
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3294,7 +3294,7 @@ class TransactionsTest extends Scope
         $this->assertEquals('special', $response['body']['category']);
         $this->assertEquals('high', $response['body']['priority'], 'Document updated in transaction should be matched by bulk update query');
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_2", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3303,8 +3303,8 @@ class TransactionsTest extends Scope
         $this->assertEquals('special', $response['body']['category']);
         $this->assertEquals('high', $response['body']['priority'], 'Document updated in transaction should be matched by bulk update query');
 
-        // Verify other documents were not affected
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_3", array_merge([
+        // Verify other rows were not affected
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_3", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
@@ -3315,11 +3315,11 @@ class TransactionsTest extends Scope
     }
 
     /**
-     * Test bulk delete with queries that should match documents created in the same transaction
+     * Test bulk delete with queries that should match rows created in the same transaction
      */
     public function testBulkDeleteMatchingCreatedDocuments(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -3331,12 +3331,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -3346,10 +3346,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3359,7 +3359,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3371,14 +3371,14 @@ class TransactionsTest extends Scope
 
         sleep(3); // Wait for columns to be created
 
-        // Create existing documents
+        // Create existing rows
         for ($i = 1; $i <= 3; $i++) {
-            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                'documentId' => 'existing_' . $i,
+                'rowId' => 'existing_' . $i,
                 'data' => [
                     'name' => 'Existing ' . $i,
                     'type' => 'permanent'
@@ -3395,13 +3395,13 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Step 1: Create temporary documents in transaction
-        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Step 1: Create temporary rows in transaction
+        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'temp_1',
+            'rowId' => 'temp_1',
             'data' => [
                 'name' => 'Temporary 1',
                 'type' => 'temporary'
@@ -3411,12 +3411,12 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(201, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        $response = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'documentId' => 'temp_2',
+            'rowId' => 'temp_2',
             'data' => [
                 'name' => 'Temporary 2',
                 'type' => 'temporary'
@@ -3426,9 +3426,9 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(201, $response['headers']['status-code']);
 
-        // Step 2: Bulk delete all documents with type 'temporary'
-        // This should delete the documents we just created in the transaction
-        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Step 2: Bulk delete all rows with type 'temporary'
+        // This should delete the rows we just created in the transaction
+        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3450,39 +3450,39 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Verify temporary documents were deleted (should not exist)
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/temp_1", array_merge([
+        // Verify temporary rows were deleted (should not exist)
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/temp_1", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(404, $response['headers']['status-code'], 'Temporary document created and deleted in transaction should not exist');
+        $this->assertEquals(404, $response['headers']['status-code'], 'Temporary row created and deleted in transaction should not exist');
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/temp_2", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/temp_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
-        $this->assertEquals(404, $response['headers']['status-code'], 'Temporary document created and deleted in transaction should not exist');
+        $this->assertEquals(404, $response['headers']['status-code'], 'Temporary row created and deleted in transaction should not exist');
 
-        // Verify existing documents were not affected
+        // Verify existing rows were not affected
         for ($i = 1; $i <= 3; $i++) {
-            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/existing_{$i}", array_merge([
+            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/existing_{$i}", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));
 
-            $this->assertEquals(200, $response['headers']['status-code'], "Permanent document {$i} should still exist");
+            $this->assertEquals(200, $response['headers']['status-code'], "Permanent row {$i} should still exist");
             $this->assertEquals('permanent', $response['body']['type']);
         }
     }
 
     /**
-     * Test bulk delete with queries that should match documents updated in the same transaction
+     * Test bulk delete with queries that should match rows updated in the same transaction
      */
     public function testBulkDeleteMatchingUpdatedDocuments(): void
     {
-        // Create database and collection
+        // Create database and table
         $database = $this->client->call(Client::METHOD_POST, '/tablesdb', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -3494,12 +3494,12 @@ class TransactionsTest extends Scope
 
         $databaseId = $database['body']['$id'];
 
-        $collection = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
+        $table = $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
         ]), [
-            'collectionId' => ID::unique(),
+            'tableId' => ID::unique(),
             'name' => 'TestCollection',
             'permissions' => [
                 Permission::read(Role::any()),
@@ -3509,10 +3509,10 @@ class TransactionsTest extends Scope
             ],
         ]);
 
-        $collectionId = $collection['body']['$id'];
+        $tableId = $table['body']['$id'];
 
         // Create columns
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3522,7 +3522,7 @@ class TransactionsTest extends Scope
             'required' => true,
         ]);
 
-        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/columns/string", array_merge([
+        $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/columns/string", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3534,14 +3534,14 @@ class TransactionsTest extends Scope
 
         sleep(3); // Wait for columns to be created
 
-        // Create existing documents
+        // Create existing rows
         for ($i = 1; $i <= 5; $i++) {
-            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+            $this->client->call(Client::METHOD_POST, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey']
             ]), [
-                'documentId' => 'doc_' . $i,
+                'rowId' => 'doc_' . $i,
                 'data' => [
                     'name' => 'Document ' . $i,
                     'status' => 'active'
@@ -3558,8 +3558,8 @@ class TransactionsTest extends Scope
 
         $transactionId = $transaction['body']['$id'];
 
-        // Step 1: Mark some documents for deletion by updating their status
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_2", array_merge([
+        // Step 1: Mark some rows for deletion by updating their status
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3572,7 +3572,7 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_4", array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_4", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3585,9 +3585,9 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Step 2: Bulk delete all documents with status 'marked_for_deletion'
-        // This should delete the documents we just updated in the transaction
-        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows", array_merge([
+        // Step 2: Bulk delete all rows with status 'marked_for_deletion'
+        // This should delete the rows we just updated in the transaction
+        $response = $this->client->call(Client::METHOD_DELETE, "/tablesdb/{$databaseId}/tables/{$tableId}/rows", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -3609,24 +3609,24 @@ class TransactionsTest extends Scope
 
         $this->assertEquals(200, $response['headers']['status-code']);
 
-        // Verify marked documents were deleted
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_2", array_merge([
+        // Verify marked rows were deleted
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_2", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals(404, $response['headers']['status-code'], 'Document marked for deletion should have been deleted');
 
-        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_4", array_merge([
+        $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_4", array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
         ], $this->getHeaders()));
 
         $this->assertEquals(404, $response['headers']['status-code'], 'Document marked for deletion should have been deleted');
 
-        // Verify other documents still exist
+        // Verify other rows still exist
         foreach ([1, 3, 5] as $i) {
-            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$collectionId}/rows/doc_{$i}", array_merge([
+            $response = $this->client->call(Client::METHOD_GET, "/tablesdb/{$databaseId}/tables/{$tableId}/rows/doc_{$i}", array_merge([
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
             ], $this->getHeaders()));