diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 658b200ec..ac6d1a550 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -56,7 +56,7 @@ App::post('/v1/account')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->action(function ($email, $password, $name, $request, $response, $project, $projectDB, $webhooks, $audits) use ($oauth2Keys) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
@@ -262,7 +262,7 @@ App::get('/v1/account/sessions/oauth2/:provider')
     ->param('scopes', [], new ArrayList(new Text(128)), 'A list of custom OAuth2 scopes. Check each provider internal docs for a list of supported scopes.', true)
     ->action(function ($provider, $success, $failure, $scopes, $request, $response, $project) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
 
         $protocol = $request->getProtocol();
@@ -307,7 +307,7 @@ App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     ->param('state', '', new Text(2048), 'Login state params.', true)
     ->action(function ($projectId, $provider, $code, $state, $request, $response) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $domain = $request->getHostname();
         $protocol = $request->getProtocol();
@@ -332,7 +332,7 @@ App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     ->param('state', '', new Text(2048), 'Login state params.', true)
     ->action(function ($projectId, $provider, $code, $state, $request, $response) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $domain = $request->getHostname();
         $protocol = $request->getProtocol();
@@ -358,7 +358,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->param('state', '', new Text(2048), 'OAuth2 state params.', true)
     ->action(function ($provider, $code, $state, $request, $response, $project, $user, $projectDB, $audits) use ($oauthDefaultSuccess) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
@@ -553,7 +553,7 @@ App::get('/v1/account')
     ->label('sdk.description', '/docs/references/account/get.md')
     ->label('sdk.response', ['200' => 'user'])
     ->action(function ($response, $user) use ($oauth2Keys) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
 
         $response->json(\array_merge($user->getArrayCopy(\array_merge(
@@ -577,7 +577,7 @@ App::get('/v1/account/prefs')
     ->label('sdk.method', 'getPrefs')
     ->label('sdk.description', '/docs/references/account/get-prefs.md')
     ->action(function ($response, $user) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
 
         $prefs = $user->getAttribute('prefs', '{}');
@@ -601,7 +601,7 @@ App::get('/v1/account/sessions')
     ->label('sdk.method', 'getSessions')
     ->label('sdk.description', '/docs/references/account/get-sessions.md')
     ->action(function ($response, $user, $locale, $geodb) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Utopia\Locale\Locale $locale */
         /** @var MaxMind\Db\Reader $geodb */
@@ -669,7 +669,7 @@ App::get('/v1/account/logs')
     ->label('sdk.method', 'getLogs')
     ->label('sdk.description', '/docs/references/account/get-logs.md')
     ->action(function ($response, $register, $project, $user, $locale, $geodb) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Document $user */
         /** @var Utopia\Locale\Locale $locale */
@@ -753,7 +753,7 @@ App::patch('/v1/account/name')
     ->label('sdk.description', '/docs/references/account/update-name.md')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.')
     ->action(function ($name, $response, $user, $projectDB, $audits) use ($oauth2Keys) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -795,7 +795,7 @@ App::patch('/v1/account/password')
     ->param('password', '', new Password(), 'New user password. Must be between 6 to 32 chars.')
     ->param('oldPassword', '', new Password(), 'Old user password. Must be between 6 to 32 chars.')
     ->action(function ($password, $oldPassword, $response, $user, $projectDB, $audits) use ($oauth2Keys) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -841,7 +841,7 @@ App::patch('/v1/account/email')
     ->param('email', '', new Email(), 'User email.')
     ->param('password', '', new Password(), 'User password. Must be between 6 to 32 chars.')
     ->action(function ($email, $password, $response, $user, $projectDB, $audits) use ($oauth2Keys) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -901,7 +901,7 @@ App::patch('/v1/account/prefs')
     ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
     ->label('sdk.description', '/docs/references/account/update-prefs.md')
     ->action(function ($prefs, $response, $user, $projectDB, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -945,7 +945,7 @@ App::delete('/v1/account')
     ->label('sdk.description', '/docs/references/account/delete.md')
     ->action(function ($request, $response, $user, $projectDB, $audits, $webhooks) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -1008,7 +1008,7 @@ App::delete('/v1/account/sessions/:sessionId')
     ->param('sessionId', null, new UID(), 'Session unique ID. Use the string \'current\' to delete the current device session.')
     ->action(function ($sessionId, $request, $response, $user, $projectDB, $audits, $webhooks) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -1072,7 +1072,7 @@ App::delete('/v1/account/sessions')
     ->label('abuse-limit', 100)
     ->action(function ($request, $response, $user, $projectDB, $audits, $webhooks) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -1130,7 +1130,7 @@ App::post('/v1/account/recovery')
     ->param('url', '', function ($clients) { return new Host($clients); }, 'URL to redirect the user back to your app from the recovery email. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', false, ['clients'])
     ->action(function ($email, $url, $request, $response, $projectDB, $project, $locale, $mails, $audits) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Database\Document $project */
         /** @var Utopia\Locale\Locale $locale */
@@ -1237,7 +1237,7 @@ App::put('/v1/account/recovery')
     ->param('password', '', new Password(), 'New password. Must be between 6 to 32 chars.')
     ->param('passwordAgain', '', new Password(), 'New password again. Must be between 6 to 32 chars.')
     ->action(function ($userId, $secret, $password, $passwordAgain, $response, $projectDB, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
     
@@ -1307,7 +1307,7 @@ App::post('/v1/account/verification')
     ->param('url', '', function ($clients) { return new Host($clients); }, 'URL to redirect the user back to your app from the verification email. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', false, ['clients']) // TODO add built-in confirm page
     ->action(function ($url, $request, $response, $project, $user, $projectDB, $locale, $audits, $mails) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
@@ -1402,7 +1402,7 @@ App::put('/v1/account/verification')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->param('secret', '', new Text(256), 'Valid verification token.')
     ->action(function ($userId, $secret, $response, $user, $projectDB, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index 5a3e9e48d..5b75073f2 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -17,7 +17,7 @@ use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
 
 $avatarCallback = function ($type, $code, $width, $height, $quality, $response) {
-    /** @var Utopia\Response $response */
+    /** @var Appwrite\Utopia\Response $response */
 
     $code = \strtolower($code);
     $type = \strtolower($type);
@@ -143,7 +143,7 @@ App::get('/v1/avatars/image')
     ->param('width', 400, new Range(0, 2000), 'Resize preview image width, Pass an integer between 0 to 2000.', true)
     ->param('height', 400, new Range(0, 2000), 'Resize preview image height, Pass an integer between 0 to 2000.', true)
     ->action(function ($url, $width, $height, $response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $quality = 80;
         $output = 'png';
@@ -207,7 +207,7 @@ App::get('/v1/avatars/favicon')
     ->label('sdk.description', '/docs/references/avatars/get-favicon.md')
     ->param('url', '', new URL(), 'Website URL which you want to fetch the favicon from.')
     ->action(function ($url, $response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $width = 56;
         $height = 56;
@@ -360,7 +360,7 @@ App::get('/v1/avatars/qr')
     ->param('margin', 1, new Range(0, 10), 'Margin from edge. Pass an integer between 0 to 10. Defaults to 1.', true)
     ->param('download', false, new Boolean(true), 'Return resulting image with \'Content-Disposition: attachment \' headers for the browser to start downloading it. Pass 0 for no header, or 1 for otherwise. Default value is set to 0.', true)
     ->action(function ($text, $size, $margin, $download, $response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $download = ($download === '1' || $download === 'true' || $download === 1 || $download === true);
         $options = new QROptions([
@@ -396,7 +396,7 @@ App::get('/v1/avatars/initials')
     ->param('color', '', new HexColor(), 'Changes text color. By default a random color will be picked and stay will persistent to the given name.', true)
     ->param('background', '', new HexColor(), 'Changes background color. By default a random color will be picked and stay will persistent to the given name.', true)
     ->action(function ($name, $width, $height, $color, $background, $response, $user) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
 
         $themes = [
diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index a24de8088..b535bb489 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -35,7 +35,7 @@ App::post('/v1/database/collections')
     ->param('write', [], new ArrayList(new Text(64)), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
     ->param('rules', [], function ($projectDB) { return new ArrayList(new Collection($projectDB, [Database::SYSTEM_COLLECTION_RULES], ['$collection' => Database::SYSTEM_COLLECTION_RULES, '$permissions' => ['read' => [], 'write' => []]])); }, 'Array of [rule objects](/docs/rules). Each rule define a collection field name, data type and validation.', false, ['projectDB'])
     ->action(function ($name, $read, $write, $rules, $response, $projectDB, $webhooks, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
@@ -111,7 +111,7 @@ App::get('/v1/database/collections')
     ->param('offset', 0, new Range(0, 40000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $results = $projectDB->getCollection([
@@ -139,7 +139,7 @@ App::get('/v1/database/collections/:collectionId')
     ->label('sdk.description', '/docs/references/database/get-collection.md')
     ->param('collectionId', '', new UID(), 'Collection unique ID.')
     ->action(function ($collectionId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         
         $collection = $projectDB->getDocument($collectionId, false);
@@ -231,7 +231,7 @@ App::put('/v1/database/collections/:collectionId')
     ->param('write', [], new ArrayList(new Text(64)), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
     ->param('rules', [], function ($projectDB) { return new ArrayList(new Collection($projectDB, [Database::SYSTEM_COLLECTION_RULES], ['$collection' => Database::SYSTEM_COLLECTION_RULES, '$permissions' => ['read' => [], 'write' => []]])); }, 'Array of [rule objects](/docs/rules). Each rule define a collection field name, data type and validation.', true, ['projectDB'])
     ->action(function ($collectionId, $name, $read, $write, $rules, $response, $projectDB, $webhooks, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
@@ -303,7 +303,7 @@ App::delete('/v1/database/collections/:collectionId')
     ->label('sdk.description', '/docs/references/database/delete-collection.md')
     ->param('collectionId', '', new UID(), 'Collection unique ID.')
     ->action(function ($collectionId, $response, $projectDB, $webhooks, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
@@ -350,7 +350,7 @@ App::post('/v1/database/collections/:collectionId/documents')
     ->param('parentProperty', '', new Key(), 'Parent document property name. Use when you want your new document to be a child of a parent document.', true)
     ->param('parentPropertyType', Document::SET_TYPE_ASSIGN, new WhiteList([Document::SET_TYPE_ASSIGN, Document::SET_TYPE_APPEND, Document::SET_TYPE_PREPEND], true), 'Parent document property connection type. You can set this value to **assign**, **append** or **prepend**, default value is assign. Use when you want your new document to be a child of a parent document.', true)
     ->action(function ($collectionId, $data, $read, $write, $parentDocument, $parentProperty, $parentPropertyType, $response, $projectDB, $webhooks, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
@@ -474,7 +474,7 @@ App::get('/v1/database/collections/:collectionId/documents')
     ->param('orderCast', 'string', new WhiteList(['int', 'string', 'date', 'time', 'datetime'], true), 'Order field type casting. Possible values are int, string, date, time or datetime. The database will attempt to cast the order field to the value you pass here. The default value is a string.', true)
     ->param('search', '', new Text(256), 'Search query. Enter any free text search. The database will try to find a match against all document attributes and children. Max length: 256 chars.', true)
     ->action(function ($collectionId, $filters, $limit, $offset, $orderField, $orderType, $orderCast, $search, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $collection = $projectDB->getDocument($collectionId, false);
@@ -530,7 +530,7 @@ App::get('/v1/database/collections/:collectionId/documents/:documentId')
     ->param('documentId', null, new UID(), 'Document unique ID.')
     ->action(function ($collectionId, $documentId, $request, $response, $projectDB) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $document = $projectDB->getDocument($documentId, false);
@@ -581,7 +581,7 @@ App::patch('/v1/database/collections/:collectionId/documents/:documentId')
     ->param('read', [], new ArrayList(new Text(64)), 'An array of strings with read permissions. By default no user is granted with any read permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
     ->param('write', [], new ArrayList(new Text(64)), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
     ->action(function ($collectionId, $documentId, $data, $read, $write, $response, $projectDB, $webhooks, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
@@ -661,7 +661,7 @@ App::delete('/v1/database/collections/:collectionId/documents/:documentId')
     ->param('collectionId', null, new UID(), 'Collection unique ID. You can create a new collection with validation rules using the Database service [server integration](/docs/server/database#createCollection).')
     ->param('documentId', null, new UID(), 'Document unique ID.')
     ->action(function ($collectionId, $documentId, $response, $projectDB, $webhooks, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 039eeb3f5..d2e1c7079 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -416,7 +416,7 @@ App::post('/v1/functions/:functionId/executions')
     ->param('functionId', '', new UID(), 'Function unique ID.')
     ->param('async', 1, new Range(0, 1), 'Execute code asynchronously. Pass 1 for true, 0 for false. Default value is 1.', true)
     ->action(function ($functionId, $async, $response, $project, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Database $projectDB */
 
diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index 5ef4f2b9c..8b146167d 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -15,7 +15,7 @@ App::get('/v1/health')
     ->label('sdk.method', 'get')
     ->label('sdk.description', '/docs/references/health/get.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['status' => 'OK']);
     }, ['response']);
@@ -25,7 +25,7 @@ App::get('/v1/health/version')
     ->groups(['api', 'health'])
     ->label('scope', 'public')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['version' => APP_VERSION_STABLE]);
     }, ['response']);
@@ -39,7 +39,7 @@ App::get('/v1/health/db')
     ->label('sdk.method', 'getDB')
     ->label('sdk.description', '/docs/references/health/get-db.md')
     ->action(function ($response, $register) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Registry\Registry $register */
 
         $register->get('db'); /* @var $db PDO */
@@ -56,7 +56,7 @@ App::get('/v1/health/cache')
     ->label('sdk.method', 'getCache')
     ->label('sdk.description', '/docs/references/health/get-cache.md')
     ->action(function ($response, $register) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Registry\Registry $register */
         $register->get('cache'); /* @var $cache Predis\Client */
 
@@ -72,7 +72,7 @@ App::get('/v1/health/time')
     ->label('sdk.method', 'getTime')
     ->label('sdk.description', '/docs/references/health/get-time.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         /*
          * Code from: @see https://www.beliefmedia.com.au/query-ntp-time-server
@@ -120,7 +120,7 @@ App::get('/v1/health/queue/webhooks')
     ->label('sdk.method', 'getQueueWebhooks')
     ->label('sdk.description', '/docs/references/health/get-queue-webhooks.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['size' => Resque::size('v1-webhooks')]);
     }, ['response']);
@@ -134,7 +134,7 @@ App::get('/v1/health/queue/tasks')
     ->label('sdk.method', 'getQueueTasks')
     ->label('sdk.description', '/docs/references/health/get-queue-tasks.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['size' => Resque::size('v1-tasks')]);
     }, ['response']);
@@ -148,7 +148,7 @@ App::get('/v1/health/queue/logs')
     ->label('sdk.method', 'getQueueLogs')
     ->label('sdk.description', '/docs/references/health/get-queue-logs.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['size' => Resque::size('v1-audit')]);
     }, ['response']);
@@ -162,7 +162,7 @@ App::get('/v1/health/queue/usage')
     ->label('sdk.method', 'getQueueUsage')
     ->label('sdk.description', '/docs/references/health/get-queue-usage.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['size' => Resque::size('v1-usage')]);
     }, ['response']);
@@ -176,7 +176,7 @@ App::get('/v1/health/queue/certificates')
     ->label('sdk.method', 'getQueueCertificates')
     ->label('sdk.description', '/docs/references/health/get-queue-certificates.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['size' => Resque::size('v1-certificates')]);
     }, ['response']);
@@ -190,7 +190,7 @@ App::get('/v1/health/queue/functions')
     ->label('sdk.method', 'getQueueFunctions')
     ->label('sdk.description', '/docs/references/health/get-queue-functions.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json(['size' => Resque::size('v1-functions')]);
     }, ['response']);
@@ -204,7 +204,7 @@ App::get('/v1/health/storage/local')
     ->label('sdk.method', 'getStorageLocal')
     ->label('sdk.description', '/docs/references/health/get-storage-local.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         foreach ([
             'Uploads' => APP_STORAGE_UPLOADS,
@@ -235,7 +235,7 @@ App::get('/v1/health/anti-virus')
     ->label('sdk.method', 'getAntiVirus')
     ->label('sdk.description', '/docs/references/health/get-storage-anti-virus.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'disabled') { // Check if scans are enabled
             throw new Exception('Anitvirus is disabled');
@@ -258,7 +258,7 @@ App::get('/v1/health/stats') // Currently only used internally
     // ->label('sdk.method', 'getStats')
     ->label('docs', false)
     ->action(function ($response, $register) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Registry\Registry $register */
 
         $device = Storage::getDevice('files');
diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php
index 26b90cfea..7be2a5ce4 100644
--- a/app/controllers/api/locale.php
+++ b/app/controllers/api/locale.php
@@ -13,7 +13,7 @@ App::get('/v1/locale')
     ->label('sdk.description', '/docs/references/locale/get-locale.md')
     ->action(function ($request, $response, $locale, $geodb) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Locale\Locale $locale */
         /** @var MaxMind\Db\Reader $geodb */
 
@@ -69,7 +69,7 @@ App::get('/v1/locale/countries')
     ->label('sdk.method', 'getCountries')
     ->label('sdk.description', '/docs/references/locale/get-countries.md')
     ->action(function ($response, $locale) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Locale\Locale $locale */
 
         $list = $locale->getText('countries'); /* @var $list array */
@@ -88,7 +88,7 @@ App::get('/v1/locale/countries/eu')
     ->label('sdk.method', 'getCountriesEU')
     ->label('sdk.description', '/docs/references/locale/get-countries-eu.md')
     ->action(function ($response, $locale) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Locale\Locale $locale */
 
         $countries = $locale->getText('countries'); /* @var $countries array */
@@ -115,7 +115,7 @@ App::get('/v1/locale/countries/phones')
     ->label('sdk.method', 'getCountriesPhones')
     ->label('sdk.description', '/docs/references/locale/get-countries-phones.md')
     ->action(function ($response, $locale) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Locale\Locale $locale */
 
         $list = Config::getParam('locale-phones'); /* @var $list array */
@@ -142,7 +142,7 @@ App::get('/v1/locale/continents')
     ->label('sdk.method', 'getContinents')
     ->label('sdk.description', '/docs/references/locale/get-continents.md')
     ->action(function ($response, $locale) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Locale\Locale $locale */
 
         $list = $locale->getText('continents'); /* @var $list array */
@@ -161,7 +161,7 @@ App::get('/v1/locale/currencies')
     ->label('sdk.method', 'getCurrencies')
     ->label('sdk.description', '/docs/references/locale/get-currencies.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $currencies = Config::getParam('locale-currencies');
 
@@ -178,7 +178,7 @@ App::get('/v1/locale/languages')
     ->label('sdk.method', 'getLanguages')
     ->label('sdk.description', '/docs/references/locale/get-languages.md')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $languages = Config::getParam('locale-languages');
 
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 3f62a66c6..5037624b2 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -38,7 +38,7 @@ App::post('/v1/projects')
     ->param('legalAddress', '', new Text(256), 'Project legal Address. Max length: 256 chars.', true)
     ->param('legalTaxId', '', new Text(256), 'Project legal Tax ID. Max length: 256 chars.', true)
     ->action(function ($name, $teamId, $description, $logo, $url, $legalName, $legalCountry, $legalState, $legalCity, $legalAddress, $legalTaxId, $response, $consoleDB, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
         /** @var Appwrite\Database\Database $projectDB */
 
@@ -96,7 +96,7 @@ App::get('/v1/projects')
     ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->action(function ($search, $limit, $offset, $orderType, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $results = $consoleDB->getCollection([
@@ -122,7 +122,7 @@ App::get('/v1/projects/:projectId')
     ->label('sdk.method', 'get')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->action(function ($projectId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -143,7 +143,7 @@ App::get('/v1/projects/:projectId/usage')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('range', 'last30', new WhiteList(['daily', 'monthly', 'last30', 'last90'], true), 'Date range.', true)
     ->action(function ($projectId, $range, $response, $consoleDB, $projectDB, $register) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Utopia\Registry\Registry $register */
@@ -326,7 +326,7 @@ App::patch('/v1/projects/:projectId')
     ->param('legalAddress', '', new Text(256), 'Project legal address. Max length: 256 chars.', true)
     ->param('legalTaxId', '', new Text(256), 'Project legal tax ID. Max length: 256 chars.', true)
     ->action(function ($projectId, $name, $description, $logo, $url, $legalName, $legalCountry, $legalState, $legalCity, $legalAddress, $legalTaxId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -366,7 +366,7 @@ App::patch('/v1/projects/:projectId/oauth2')
     ->param('appId', '', new Text(256), 'Provider app ID. Max length: 256 chars.', true)
     ->param('secret', '', new text(512), 'Provider secret key. Max length: 512 chars.', true)
     ->action(function ($projectId, $provider, $appId, $secret, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -396,7 +396,7 @@ App::delete('/v1/projects/:projectId')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('password', '', new UID(), 'Your user password for confirmation. Must be between 6 to 32 chars.')
     ->action(function ($projectId, $password, $response, $user, $consoleDB, $deletes) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $consoleDB */
         /** @var Appwrite\Event\Event $deletes */
@@ -450,7 +450,7 @@ App::post('/v1/projects/:projectId/webhooks')
     ->param('httpUser', '', new Text(256), 'Webhook HTTP user. Max length: 256 chars.', true)
     ->param('httpPass', '', new Text(256), 'Webhook HTTP password. Max length: 256 chars.', true)
     ->action(function ($projectId, $name, $events, $url, $security, $httpUser, $httpPass, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -501,7 +501,7 @@ App::get('/v1/projects/:projectId/webhooks')
     ->label('sdk.method', 'listWebhooks')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->action(function ($projectId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -524,7 +524,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('webhookId', null, new UID(), 'Webhook unique ID.')
     ->action(function ($projectId, $webhookId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -557,7 +557,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
     ->param('httpUser', '', new Text(256), 'Webhook HTTP user. Max length: 256 chars.', true)
     ->param('httpPass', '', new Text(256), 'Webhook HTTP password. Max length: 256 chars.', true)
     ->action(function ($projectId, $webhookId, $name, $events, $url, $security, $httpUser, $httpPass, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -599,7 +599,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('webhookId', null, new UID(), 'Webhook unique ID.')
     ->action(function ($projectId, $webhookId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -633,7 +633,7 @@ App::post('/v1/projects/:projectId/keys')
     ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new ArrayList(new WhiteList(Config::getParam('scopes'), true)), 'Key scopes list.')
     ->action(function ($projectId, $name, $scopes, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -679,7 +679,7 @@ App::get('/v1/projects/:projectId/keys')
     ->label('sdk.method', 'listKeys')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->action(function ($projectId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
         
         $project = $consoleDB->getDocument($projectId);
@@ -726,7 +726,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
     ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new ArrayList(new WhiteList(Config::getParam('scopes'), true)), 'Key scopes list')
     ->action(function ($projectId, $keyId, $name, $scopes, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -762,7 +762,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('keyId', null, new UID(), 'Key unique ID.')
     ->action(function ($projectId, $keyId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -803,7 +803,7 @@ App::post('/v1/projects/:projectId/tasks')
     ->param('httpUser', '', new Text(256), 'Task HTTP user. Max length: 256 chars.', true)
     ->param('httpPass', '', new Text(256), 'Task HTTP password. Max length: 256 chars.', true)
     ->action(function ($projectId, $name, $status, $schedule, $security, $httpMethod, $httpUrl, $httpHeaders, $httpUser, $httpPass, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -869,7 +869,7 @@ App::get('/v1/projects/:projectId/tasks')
     ->label('sdk.method', 'listTasks')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->action(function ($projectId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -892,7 +892,7 @@ App::get('/v1/projects/:projectId/tasks/:taskId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('taskId', null, new UID(), 'Task unique ID.')
     ->action(function ($projectId, $taskId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -928,7 +928,7 @@ App::put('/v1/projects/:projectId/tasks/:taskId')
     ->param('httpUser', '', new Text(256), 'Task HTTP user. Max length: 256 chars.', true)
     ->param('httpPass', '', new Text(256), 'Task HTTP password. Max length: 256 chars.', true)
     ->action(function ($projectId, $taskId, $name, $status, $schedule, $security, $httpMethod, $httpUrl, $httpHeaders, $httpUser, $httpPass, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -982,7 +982,7 @@ App::delete('/v1/projects/:projectId/tasks/:taskId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('taskId', null, new UID(), 'Task unique ID.')
     ->action(function ($projectId, $taskId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1019,7 +1019,7 @@ App::post('/v1/projects/:projectId/platforms')
     ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
     ->param('hostname', '', new Text(256), 'Platform client hostname. Max length: 256 chars.', true)
     ->action(function ($projectId, $type, $name, $key, $store, $hostname, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1069,7 +1069,7 @@ App::get('/v1/projects/:projectId/platforms')
     ->label('sdk.method', 'listPlatforms')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->action(function ($projectId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1092,7 +1092,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('platformId', null, new UID(), 'Platform unique ID.')
     ->action(function ($projectId, $platformId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1123,7 +1123,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
     ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
     ->param('hostname', '', new Text(256), 'Platform client URL. Max length: 256 chars.', true)
     ->action(function ($projectId, $platformId, $name, $key, $store, $hostname, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1162,7 +1162,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('platformId', null, new UID(), 'Platform unique ID.')
     ->action(function ($projectId, $platformId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1195,7 +1195,7 @@ App::post('/v1/projects/:projectId/domains')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('domain', null, new DomainValidator(), 'Domain name.')
     ->action(function ($projectId, $domain, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1258,7 +1258,7 @@ App::get('/v1/projects/:projectId/domains')
     ->label('sdk.method', 'listDomains')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->action(function ($projectId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1281,7 +1281,7 @@ App::get('/v1/projects/:projectId/domains/:domainId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('domainId', null, new UID(), 'Domain unique ID.')
     ->action(function ($projectId, $domainId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1308,7 +1308,7 @@ App::patch('/v1/projects/:projectId/domains/:domainId/verification')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('domainId', null, new UID(), 'Domain unique ID.')
     ->action(function ($projectId, $domainId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
@@ -1366,7 +1366,7 @@ App::delete('/v1/projects/:projectId/domains/:domainId')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('domainId', null, new UID(), 'Domain unique ID.')
     ->action(function ($projectId, $domainId, $response, $consoleDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
         $project = $consoleDB->getDocument($projectId);
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 55ae74037..2add12c61 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -38,7 +38,7 @@ App::post('/v1/storage/files')
     ->param('write', [], new ArrayList(new Text(64)), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
     ->action(function ($file, $read, $write, $request, $response, $user, $projectDB, $webhooks, $audits, $usage) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
@@ -172,7 +172,7 @@ App::get('/v1/storage/files')
     ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $results = $projectDB->getCollection([
@@ -204,7 +204,7 @@ App::get('/v1/storage/files/:fileId')
     ->label('sdk.description', '/docs/references/storage/get-file.md')
     ->param('fileId', '', new UID(), 'File unique ID.')
     ->action(function ($fileId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $file = $projectDB->getDocument($fileId);
@@ -234,7 +234,7 @@ App::get('/v1/storage/files/:fileId/preview')
     ->param('output', '', new WhiteList(\array_keys(Config::getParam('storage-outputs')), true), 'Output format type (jpeg, jpg, png, gif and webp).', true)
     ->action(function ($fileId, $width, $height, $quality, $background, $output, $request, $response, $project, $projectDB) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Database $projectDB */
 
@@ -354,7 +354,7 @@ App::get('/v1/storage/files/:fileId/download')
     ->label('sdk.methodType', 'location')
     ->param('fileId', '', new UID(), 'File unique ID.')
     ->action(function ($fileId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $file = $projectDB->getDocument($fileId);
@@ -410,7 +410,7 @@ App::get('/v1/storage/files/:fileId/view')
     ->param('fileId', '', new UID(), 'File unique ID.')
     ->param('as', '', new WhiteList(['pdf', /*'html',*/ 'text'], true), 'Choose a file format to convert your file to. Currently you can only convert word and pdf files to pdf or txt. This option is currently experimental only, use at your own risk.', true)
     ->action(function ($fileId, $as, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $file  = $projectDB->getDocument($fileId);
@@ -483,7 +483,7 @@ App::put('/v1/storage/files/:fileId')
     ->param('read', [], new ArrayList(new Text(64)), 'An array of strings with read permissions. By default no user is granted with any read permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
     ->param('write', [], new ArrayList(new Text(64)), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
     ->action(function ($fileId, $read, $write, $response, $projectDB, $webhooks, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
@@ -529,7 +529,7 @@ App::delete('/v1/storage/files/:fileId')
     ->label('sdk.description', '/docs/references/storage/delete-file.md')
     ->param('fileId', '', new UID(), 'File unique ID.')
     ->action(function ($fileId, $response, $projectDB, $webhooks, $audits, $usage) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
         /** @var Appwrite\Event\Event $audits */
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index ab0db7a25..75cfd0c06 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -30,7 +30,7 @@ App::post('/v1/teams')
     ->param('name', null, new Text(128), 'Team name. Max length: 128 chars.')
     ->param('roles', ['owner'], new ArrayList(new Key()), 'Array of strings. Use this param to set the roles in the team for the user who created it. The default role is **owner**. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Max length for each role is 32 chars.', true)
     ->action(function ($name, $roles, $response, $user, $projectDB, $mode) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var bool $mode */
@@ -99,7 +99,7 @@ App::get('/v1/teams')
     ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $results = $projectDB->getCollection([
@@ -127,7 +127,7 @@ App::get('/v1/teams/:teamId')
     ->label('sdk.description', '/docs/references/teams/get-team.md')
     ->param('teamId', '', new UID(), 'Team unique ID.')
     ->action(function ($teamId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $team = $projectDB->getDocument($teamId);
@@ -150,7 +150,7 @@ App::put('/v1/teams/:teamId')
     ->param('teamId', '', new UID(), 'Team unique ID.')
     ->param('name', null, new Text(128), 'Team name. Max length: 128 chars.')
     ->action(function ($teamId, $name, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $team = $projectDB->getDocument($teamId);
@@ -180,7 +180,7 @@ App::delete('/v1/teams/:teamId')
     ->label('sdk.description', '/docs/references/teams/delete-team.md')
     ->param('teamId', '', new UID(), 'Team unique ID.')
     ->action(function ($teamId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $team = $projectDB->getDocument($teamId);
@@ -225,7 +225,7 @@ App::post('/v1/teams/:teamId/memberships')
     ->param('roles', [], new ArrayList(new Key()), 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Max length for each role is 32 chars.')
     ->param('url', '', function ($clients) { return new Host($clients); }, 'URL to redirect the user back to your app from the invitation email.  Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', false, ['clients']) // TODO add our own built-in confirm page
     ->action(function ($teamId, $email, $name, $roles, $url, $response, $project, $user, $projectDB, $locale, $audits, $mails, $mode) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
@@ -422,7 +422,7 @@ App::get('/v1/teams/:teamId/memberships')
     ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->action(function ($teamId, $search, $limit, $offset, $orderType, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $team = $projectDB->getDocument($teamId);
@@ -481,7 +481,7 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
     ->param('secret', '', new Text(256), 'Secret key.')
     ->action(function ($teamId, $inviteId, $userId, $secret, $request, $response, $user, $projectDB, $audits) {
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
@@ -608,7 +608,7 @@ App::delete('/v1/teams/:teamId/memberships/:inviteId')
     ->param('teamId', '', new UID(), 'Team unique ID.')
     ->param('inviteId', '', new UID(), 'Invite unique ID.')
     ->action(function ($teamId, $inviteId, $response, $projectDB, $audits) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $audits */
 
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 741d0c661..89e828018 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -30,7 +30,7 @@ App::post('/v1/users')
     ->param('password', '', new Password(), 'User password. Must be between 6 to 32 chars.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->action(function ($email, $password, $name, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $profile = $projectDB->getCollectionFirst([ // Get user by email address
@@ -101,7 +101,7 @@ App::get('/v1/users')
     ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $results = $projectDB->getCollection([
@@ -154,7 +154,7 @@ App::get('/v1/users/:userId')
     ->label('sdk.description', '/docs/references/users/get-user.md')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->action(function ($userId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $user = $projectDB->getDocument($userId);
@@ -197,7 +197,7 @@ App::get('/v1/users/:userId/prefs')
     ->label('sdk.description', '/docs/references/users/get-user-prefs.md')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->action(function ($userId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $user = $projectDB->getDocument($userId);
@@ -228,7 +228,7 @@ App::get('/v1/users/:userId/sessions')
     ->label('sdk.description', '/docs/references/users/get-user-sessions.md')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->action(function ($userId, $response, $projectDB, $locale, $geodb) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Utopia\Locale\Locale $locale */
         /** @var MaxMind\Db\Reader $geodb */
@@ -301,7 +301,7 @@ App::get('/v1/users/:userId/logs')
     ->label('sdk.description', '/docs/references/users/get-user-logs.md')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->action(function ($userId, $response, $register, $project, $projectDB, $locale, $geodb) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Registry\Registry $register */
         /** @var Appwrite\Database\Document $project */
         /** @var Appwrite\Database\Database $projectDB */
@@ -393,7 +393,7 @@ App::patch('/v1/users/:userId/status')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->param('status', '', new WhiteList([Auth::USER_STATUS_ACTIVATED, Auth::USER_STATUS_BLOCKED, Auth::USER_STATUS_UNACTIVATED], true), 'User Status code. To activate the user pass '.Auth::USER_STATUS_ACTIVATED.', to block the user pass '.Auth::USER_STATUS_BLOCKED.' and for disabling the user pass '.Auth::USER_STATUS_UNACTIVATED)
     ->action(function ($userId, $status, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $user = $projectDB->getDocument($userId);
@@ -443,7 +443,7 @@ App::patch('/v1/users/:userId/prefs')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
     ->action(function ($userId, $prefs, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $user = $projectDB->getDocument($userId);
@@ -487,7 +487,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->param('userId', '', new UID(), 'User unique ID.')
     ->param('sessionId', null, new UID(), 'User unique session ID.')
     ->action(function ($userId, $sessionId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $user = $projectDB->getDocument($userId);
@@ -520,7 +520,7 @@ App::delete('/v1/users/:userId/sessions')
     ->label('abuse-limit', 100)
     ->param('userId', '', new UID(), 'User unique ID.')
     ->action(function ($userId, $response, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
 
         $user = $projectDB->getDocument($userId);
@@ -551,7 +551,7 @@ App::delete('/v1/users/:userId')
     ->label('abuse-limit', 100)
     ->param('userId', '', function () {return new UID();}, 'User unique ID.')
     ->action(function ($userId, $response, $projectDB, $deletes) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $deletes */
         
diff --git a/app/controllers/general.php b/app/controllers/general.php
index b83630a23..0f283d3f5 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -247,7 +247,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
 App::shutdown(function ($utopia, $request, $response, $project, $webhooks, $audits, $usage, $deletes, $mode) {
     /** @var Utopia\App $utopia */
     /** @var Utopia\Swoole\Request $request */
-    /** @var Utopia\Response $response */
+    /** @var Appwrite\Utopia\Response $response */
     /** @var Appwrite\Database\Document $project */
     /** @var Appwrite\Event\Event $webhooks */
     /** @var Appwrite\Event\Event $audits */
@@ -387,7 +387,7 @@ App::get('/manifest.json')
     ->label('scope', 'public')
     ->label('docs', false)
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->json([
             'name' => APP_NAME,
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index a1a4d6cf6..d64c46a2c 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -8,7 +8,7 @@ use Utopia\Abuse\Adapters\TimeLimit;
 App::init(function ($utopia, $request, $response, $project, $user, $register) {
     /** @var Utopia\App $utopia */
     /** @var Utopia\Swoole\Request $request */
-    /** @var Utopia\Response $response */
+    /** @var Appwrite\Utopia\Response $response */
     /** @var Appwrite\Database\Document $project */
     /** @var Appwrite\Database\Document $user */
     /** @var Utopia\Registry\Registry $register */
diff --git a/app/controllers/shared/web.php b/app/controllers/shared/web.php
index 383685e0d..42d2a18c5 100644
--- a/app/controllers/shared/web.php
+++ b/app/controllers/shared/web.php
@@ -6,7 +6,7 @@ use Utopia\Config\Config;
 App::init(function ($utopia, $request, $response, $layout) {
     /** @var Utopia\App $utopia */
     /** @var Utopia\Swoole\Request $request */
-    /** @var Utopia\Response $response */
+    /** @var Appwrite\Utopia\Response $response */
     /** @var Utopia\View $layout */
 
     /* AJAX check  */
diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
index 6c2f7ba44..47e1848a6 100644
--- a/app/controllers/web/console.php
+++ b/app/controllers/web/console.php
@@ -19,7 +19,7 @@ App::init(function ($layout) {
 }, ['layout'], 'console');
 
 App::shutdown(function ($response, $layout) {
-    /** @var Utopia\Response $response */
+    /** @var Appwrite\Utopia\Response $response */
     /** @var Utopia\View $layout */
 
     $header = new View(__DIR__.'/../../views/console/comps/header.phtml');
@@ -213,7 +213,7 @@ App::get('/console/database/collection')
     ->label('scope', 'console')
     ->param('id', '', new UID(), 'Collection unique ID.')
     ->action(function ($id, $response, $layout, $projectDB) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\View $layout */
         /** @var Appwrite\Database\Database $projectDB */
 
diff --git a/app/controllers/web/home.php b/app/controllers/web/home.php
index f2cf21ffd..7f7f41970 100644
--- a/app/controllers/web/home.php
+++ b/app/controllers/web/home.php
@@ -28,7 +28,7 @@ App::init(function ($layout) {
 }, ['layout'], 'home');
 
 App::shutdown(function ($response, $layout) {
-    /** @var Utopia\Response $response */
+    /** @var Appwrite\Utopia\Response $response */
     /** @var Utopia\View $layout */
 
     $response->html($layout->render());
@@ -39,7 +39,7 @@ App::get('/')
     ->label('permission', 'public')
     ->label('scope', 'home')
     ->action(function ($response) {
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $response->redirect('/auth/signin');
     }, ['response']);
@@ -190,7 +190,7 @@ App::get('/open-api-2.json')
     ->action(function ($platform, $extensions, $tests, $utopia, $request, $response) {
         /** @var Utopia\App $utopia */
         /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Response $response */
+        /** @var Appwrite\Utopia\Response $response */
 
         $security = [
             APP_PLATFORM_CLIENT => ['Project' => []],
diff --git a/app/init.php b/app/init.php
index 8c3457dd3..d372c62e6 100644
--- a/app/init.php
+++ b/app/init.php
@@ -362,7 +362,7 @@ App::setResource('clients', function($console, $project) {
 
 App::setResource('user', function($mode, $project, $console, $request, $response, $projectDB, $consoleDB) {
     /** @var Utopia\Swoole\Request $request */
-    /** @var Utopia\Response $response */
+    /** @var Appwrite\Utopia\Response $response */
     /** @var Appwrite\Database\Document $project */
     /** @var Appwrite\Database\Database $consoleDB */
     /** @var Appwrite\Database\Database $projectDB */