diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 5a5884243..1c30e07ba 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -1727,7 +1727,7 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
     ->label('scope', 'providers.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'messaging')
-    ->label('sdk.method', 'updateFCMProvider')
+    ->label('sdk.method', 'updateFcmProvider')
     ->label('sdk.description', '/docs/references/messaging/update-fcm-provider.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
@@ -1796,7 +1796,7 @@ App::patch('/v1/messaging/providers/apns/:providerId')
     ->label('scope', 'providers.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'messaging')
-    ->label('sdk.method', 'updateAPNSProvider')
+    ->label('sdk.method', 'updateApnsProvider')
     ->label('sdk.description', '/docs/references/messaging/update-apns-provider.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
diff --git a/tests/e2e/Services/GraphQL/Base.php b/tests/e2e/Services/GraphQL/Base.php
index d4f290c3d..01153cdd0 100644
--- a/tests/e2e/Services/GraphQL/Base.php
+++ b/tests/e2e/Services/GraphQL/Base.php
@@ -1872,8 +1872,8 @@ trait Base
                     }
                 }';
             case self::$CREATE_FCM_PROVIDER:
-                return 'mutation createFCMProvider($providerId: String!, $name: String!, $serviceAccountJSON: Json) {
-                    messagingCreateFCMProvider(providerId: $providerId, name: $name, serviceAccountJSON: $serviceAccountJSON) {
+                return 'mutation createFcmProvider($providerId: String!, $name: String!, $serviceAccountJSON: Json) {
+                    messagingCreateFcmProvider(providerId: $providerId, name: $name, serviceAccountJSON: $serviceAccountJSON) {
                         _id
                         name
                         provider
@@ -1882,8 +1882,8 @@ trait Base
                     }
                 }';
             case self::$CREATE_APNS_PROVIDER:
-                return 'mutation createAPNSProvider($providerId: String!, $name: String!, $authKey: String!, $authKeyId: String!, $teamId: String!, $bundleId: String!) {
-                    messagingCreateAPNSProvider(providerId: $providerId, name: $name, authKey: $authKey, authKeyId: $authKeyId, teamId: $teamId, bundleId: $bundleId) {
+                return 'mutation createApnsProvider($providerId: String!, $name: String!, $authKey: String!, $authKeyId: String!, $teamId: String!, $bundleId: String!) {
+                    messagingCreateApnsProvider(providerId: $providerId, name: $name, authKey: $authKey, authKeyId: $authKeyId, teamId: $teamId, bundleId: $bundleId) {
                         _id
                         name
                         provider
@@ -1996,8 +1996,8 @@ trait Base
                     }
                 }';
             case self::$UPDATE_FCM_PROVIDER:
-                return 'mutation updateFCMProvider($providerId: String!, $name: String!, $serviceAccountJSON: Json) {
-                    messagingUpdateFCMProvider(providerId: $providerId, name: $name, serviceAccountJSON: $serviceAccountJSON) {
+                return 'mutation updateFcmProvider($providerId: String!, $name: String!, $serviceAccountJSON: Json) {
+                    messagingUpdateFcmProvider(providerId: $providerId, name: $name, serviceAccountJSON: $serviceAccountJSON) {
                         _id
                         name
                         provider
@@ -2006,8 +2006,8 @@ trait Base
                     }
                 }';
             case self::$UPDATE_APNS_PROVIDER:
-                return 'mutation updateAPNSProvider($providerId: String!, $name: String!, $authKey: String!, $authKeyId: String!, $teamId: String!, $bundleId: String!) {
-                    messagingUpdateAPNSProvider(providerId: $providerId, name: $name, authKey: $authKey, authKeyId: $authKeyId, teamId: $teamId, bundleId: $bundleId) {
+                return 'mutation updateApnsProvider($providerId: String!, $name: String!, $authKey: String!, $authKeyId: String!, $teamId: String!, $bundleId: String!) {
+                    messagingUpdateApnsProvider(providerId: $providerId, name: $name, authKey: $authKey, authKeyId: $authKeyId, teamId: $teamId, bundleId: $bundleId) {
                         _id
                         name
                         provider
diff --git a/tests/e2e/Services/GraphQL/MessagingTest.php b/tests/e2e/Services/GraphQL/MessagingTest.php
index 18fcf71f0..f5e92b911 100644
--- a/tests/e2e/Services/GraphQL/MessagingTest.php
+++ b/tests/e2e/Services/GraphQL/MessagingTest.php
@@ -70,7 +70,7 @@ class MessagingTest extends Scope
                 'apiSecret' => 'my-apisecret',
                 'from' => '+123456789',
             ],
-            'FCM' => [
+            'Fcm' => [
                 'providerId' => ID::unique(),
                 'name' => 'FCM1',
                 'serviceAccountJSON' => [
@@ -80,7 +80,7 @@ class MessagingTest extends Scope
                     "private_key" => "test-private-key",
                 ]
             ],
-            'APNS' => [
+            'Apns' => [
                 'providerId' => ID::unique(),
                 'name' => 'APNS1',
                 'authKey' => 'my-authkey',
@@ -159,7 +159,7 @@ class MessagingTest extends Scope
                 'apiKey' => 'my-apikey',
                 'apiSecret' => 'my-apisecret',
             ],
-            'FCM' => [
+            'Fcm' => [
                 'providerId' => $providers[7]['_id'],
                 'name' => 'FCM2',
                 'serviceAccountJSON' => [
@@ -169,7 +169,7 @@ class MessagingTest extends Scope
                     'private_key' => "test-private-key",
                 ]
             ],
-            'APNS' => [
+            'Apns' => [
                 'providerId' => $providers[8]['_id'],
                 'name' => 'APNS2',
                 'authKey' => 'my-authkey',
@@ -180,15 +180,18 @@ class MessagingTest extends Scope
         ];
         foreach (\array_keys($providersParams) as $index => $key) {
             $query = $this->getQuery('update_' . \strtolower($key) . '_provider');
+
             $graphQLPayload = [
                 'query' => $query,
                 'variables' => $providersParams[$key],
             ];
+
             $response = $this->client->call(Client::METHOD_POST, '/graphql', [
                 'content-type' => 'application/json',
                 'x-appwrite-project' => $this->getProject()['$id'],
                 'x-appwrite-key' => $this->getProject()['apiKey'],
             ], $graphQLPayload);
+
             $providers[$index] = $response['body']['data']['messagingUpdate' . $key . 'Provider'];
             $this->assertEquals(200, $response['headers']['status-code']);
             $this->assertEquals($providersParams[$key]['name'], $response['body']['data']['messagingUpdate' . $key . 'Provider']['name']);
@@ -991,7 +994,7 @@ class MessagingTest extends Scope
 
         $this->assertEquals(200, $provider['headers']['status-code']);
 
-        $providerId = $provider['body']['data']['messagingCreateFCMProvider']['_id'];
+        $providerId = $provider['body']['data']['messagingCreateFcmProvider']['_id'];
 
         $query = $this->getQuery(self::$CREATE_TOPIC);
         $graphQLPayload = [