diff --git a/src/Appwrite/Specification/Format.php b/src/Appwrite/Specification/Format.php
index c58d69fcb9..70a86e4f5a 100644
--- a/src/Appwrite/Specification/Format.php
+++ b/src/Appwrite/Specification/Format.php
@@ -116,6 +116,7 @@ abstract class Format
             case 'account':
                 switch ($method) {
                     case 'createOAuth2Session':
+                    case 'createOAuth2Token':
                         switch ($param) {
                             case 'provider':
                                 return 'OAuthProvider';
@@ -219,11 +220,11 @@ abstract class Format
                                 return 'MessageStatus';
                         }
                         break;
-                    case 'createSMTPProvider':
-                    case 'updateSMTPProvider':
+                    case 'createSmtpProvider':
+                    case 'updateSmtpProvider':
                         switch ($param) {
                             case 'encryption':
-                                return 'SMTPEncryption';
+                                return 'SmtpEncryption';
                         }
                         break;
                 }
diff --git a/tests/e2e/Services/GraphQL/Base.php b/tests/e2e/Services/GraphQL/Base.php
index 01153cdd04..f8c61186ab 100644
--- a/tests/e2e/Services/GraphQL/Base.php
+++ b/tests/e2e/Services/GraphQL/Base.php
@@ -1812,8 +1812,8 @@ trait Base
                     }
                 }';
             case self::$CREATE_SMTP_PROVIDER:
-                return 'mutation createSMTPProvider($providerId: String!, $name: String!, $host: String!, $port: Int!, $username: String!, $password: String!, $encryption: String!, $autoTLS: Boolean! $fromName: String!, $fromEmail: String!, $replyToName: String, $replyToEmail: String) {
-                    messagingCreateSMTPProvider(providerId: $providerId, name: $name, host: $host, port: $port, username: $username, password: $password, encryption: $encryption, autoTLS: $autoTLS, fromName: $fromName, fromEmail: $fromEmail, replyToName: $replyToName, replyToEmail: $replyToEmail) {
+                return 'mutation createSmtpProvider($providerId: String!, $name: String!, $host: String!, $port: Int!, $username: String!, $password: String!, $encryption: String!, $autoTLS: Boolean! $fromName: String!, $fromEmail: String!, $replyToName: String, $replyToEmail: String) {
+                    messagingCreateSmtpProvider(providerId: $providerId, name: $name, host: $host, port: $port, username: $username, password: $password, encryption: $encryption, autoTLS: $autoTLS, fromName: $fromName, fromEmail: $fromEmail, replyToName: $replyToName, replyToEmail: $replyToEmail) {
                         _id
                         name
                         provider
@@ -1936,8 +1936,8 @@ trait Base
                     }
                 }';
             case self::$UPDATE_SMTP_PROVIDER:
-                return 'mutation updateSMTPProvider($providerId: String!, $name: String!, $host: String!, $port: Int!, $username: String!, $password: String!, $encryption: String!, $autoTLS: Boolean!, $fromName: String, $fromEmail: String, $enabled: Boolean) {
-                    messagingUpdateSMTPProvider(providerId: $providerId, name: $name, host: $host, port: $port, username: $username, password: $password, encryption: $encryption, autoTLS: $autoTLS, fromName: $fromName, fromEmail: $fromEmail, enabled: $enabled) {
+                return 'mutation updateSmtpProvider($providerId: String!, $name: String!, $host: String!, $port: Int!, $username: String!, $password: String!, $encryption: String!, $autoTLS: Boolean!, $fromName: String, $fromEmail: String, $enabled: Boolean) {
+                    messagingUpdateSmtpProvider(providerId: $providerId, name: $name, host: $host, port: $port, username: $username, password: $password, encryption: $encryption, autoTLS: $autoTLS, fromName: $fromName, fromEmail: $fromEmail, enabled: $enabled) {
                         _id
                         name
                         provider