diff --git a/src/Appwrite/GraphQL/SwoolePromise.php b/src/Appwrite/GraphQL/CoroutinePromise.php
similarity index 100%
rename from src/Appwrite/GraphQL/SwoolePromise.php
rename to src/Appwrite/GraphQL/CoroutinePromise.php
diff --git a/src/Appwrite/GraphQL/SwoolePromiseAdapter.php b/src/Appwrite/GraphQL/CoroutinePromiseAdapter.php
similarity index 100%
rename from src/Appwrite/GraphQL/SwoolePromiseAdapter.php
rename to src/Appwrite/GraphQL/CoroutinePromiseAdapter.php
diff --git a/src/Appwrite/GraphQL/Exception.php b/src/Appwrite/GraphQL/Exception.php
deleted file mode 100644
index 804964db46..0000000000
--- a/src/Appwrite/GraphQL/Exception.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Appwrite\GraphQL;
-
-use GraphQL\Error\ClientAware;
-
-class Exception extends \Exception implements ClientAware
-{
-
-    function __construct(string $message = '', int $code = 0, string $version = '') {
-        $this->message = $message;
-        $this->code = $code;
-        $this->version = $version; 
-    }
-    
-    public function isClientSafe()
-    {
-        return true;
-    }
-
-    public function getCategory()
-    {
-        return 'Appwrite Server Exception';
-    }
-}
\ No newline at end of file
diff --git a/src/Appwrite/GraphQL/GQLException.php b/src/Appwrite/GraphQL/GQLException.php
new file mode 100644
index 0000000000..be74c4dc1b
--- /dev/null
+++ b/src/Appwrite/GraphQL/GQLException.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Appwrite\GraphQL;
+
+use Appwrite\Extend\Exception;
+use GraphQL\Error\ClientAware;
+
+class GQLException extends Exception implements ClientAware
+{
+    public function isClientSafe(): bool
+    {
+        return true;
+    }
+
+    public function getCategory(): string
+    {
+        return 'appwrite';
+    }
+}
\ No newline at end of file
diff --git a/src/Appwrite/GraphQL/ExceptionDev.php b/src/Appwrite/GraphQL/GQLExceptionDev.php
similarity index 100%
rename from src/Appwrite/GraphQL/ExceptionDev.php
rename to src/Appwrite/GraphQL/GQLExceptionDev.php