diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index dc0505f647..7f23a5be2b 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -62,7 +62,7 @@ use Appwrite\Utopia\Response\Model\Platform;
 use Appwrite\Utopia\Response\Model\Project;
 use Appwrite\Utopia\Response\Model\Rule;
 use Appwrite\Utopia\Response\Model\Deployment;
-use Appwrite\Utopia\Response\Model\EmailTemplate;
+use Appwrite\Utopia\Response\Model\TemplateEmail;
 use Appwrite\Utopia\Response\Model\Token;
 use Appwrite\Utopia\Response\Model\Webhook;
 use Appwrite\Utopia\Response\Model\Preferences;
@@ -74,7 +74,7 @@ use Appwrite\Utopia\Response\Model\HealthVersion;
 use Appwrite\Utopia\Response\Model\Mock; // Keep last
 use Appwrite\Utopia\Response\Model\Provider;
 use Appwrite\Utopia\Response\Model\Runtime;
-use Appwrite\Utopia\Response\Model\SmsTemplate;
+use Appwrite\Utopia\Response\Model\TemplateSMS;
 use Appwrite\Utopia\Response\Model\UsageBuckets;
 use Appwrite\Utopia\Response\Model\UsageCollection;
 use Appwrite\Utopia\Response\Model\UsageDatabase;
@@ -345,8 +345,8 @@ class Response extends SwooleResponse
             ->setModel(new UsageFunctions())
             ->setModel(new UsageFunction())
             ->setModel(new UsageProject())
-            ->setModel(new SmsTemplate())
-            ->setModel(new EmailTemplate())
+            ->setModel(new TemplateSMS())
+            ->setModel(new TemplateEmail())
             // Verification
             // Recovery
             // Tests (keep last)
diff --git a/src/Appwrite/Utopia/Response/Model/EmailTemplate.php b/src/Appwrite/Utopia/Response/Model/TemplateEmail.php
similarity index 97%
rename from src/Appwrite/Utopia/Response/Model/EmailTemplate.php
rename to src/Appwrite/Utopia/Response/Model/TemplateEmail.php
index e08b0eb4b5..ecdf89e774 100644
--- a/src/Appwrite/Utopia/Response/Model/EmailTemplate.php
+++ b/src/Appwrite/Utopia/Response/Model/TemplateEmail.php
@@ -4,7 +4,7 @@ namespace Appwrite\Utopia\Response\Model;
 
 use Appwrite\Utopia\Response;
 
-class EmailTemplate extends Template
+class TemplateEmail extends Template
 {
     public function __construct()
     {
diff --git a/src/Appwrite/Utopia/Response/Model/SmsTemplate.php b/src/Appwrite/Utopia/Response/Model/TemplateSMS.php
similarity index 92%
rename from src/Appwrite/Utopia/Response/Model/SmsTemplate.php
rename to src/Appwrite/Utopia/Response/Model/TemplateSMS.php
index cb8fd58498..2b19ef4878 100644
--- a/src/Appwrite/Utopia/Response/Model/SmsTemplate.php
+++ b/src/Appwrite/Utopia/Response/Model/TemplateSMS.php
@@ -4,7 +4,7 @@ namespace Appwrite\Utopia\Response\Model;
 
 use Appwrite\Utopia\Response;
 
-class SmsTemplate extends Template
+class TemplateSMS extends Template
 {
     public function __construct()
     {