diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index 7c6fdc5ec8..24476638db 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -25,7 +25,7 @@ App::get('/v1/health')
 
         $output = [
             'status' => 'pass',
-            'checkTime' => 0
+            'ping' => 0
         ];
 
         $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
@@ -79,7 +79,7 @@ App::get('/v1/health/db')
 
         $output = [
             'status' => 'pass',
-            'checkTime' => \microtime(true) - $checkStart
+            'ping' => \microtime(true) - $checkStart
         ];
 
         $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
@@ -113,7 +113,7 @@ App::get('/v1/health/cache')
 
         $output = [
             'status' => 'pass',
-            'checkTime' => \microtime(true) - $checkStart
+            'ping' => \microtime(true) - $checkStart
         ];
 
         $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
@@ -169,8 +169,8 @@ App::get('/v1/health/time')
         }
 
         $output = [
-            'remote' => $timestamp,
-            'local' => \time(),
+            'remoteTime' => $timestamp,
+            'localTime' => \time(),
             'diff' => $diff
         ];
 
@@ -321,7 +321,7 @@ App::get('/v1/health/storage/local')
 
         $output = [
             'status' => 'pass',
-            'checkTime' => \microtime(true) - $checkStart
+            'ping' => \microtime(true) - $checkStart
         ];
 
         $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
diff --git a/src/Appwrite/Utopia/Response/Model/Any.php b/src/Appwrite/Utopia/Response/Model/Any.php
index 1613f0728c..44f588250b 100644
--- a/src/Appwrite/Utopia/Response/Model/Any.php
+++ b/src/Appwrite/Utopia/Response/Model/Any.php
@@ -23,7 +23,7 @@ class Any extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/BaseList.php b/src/Appwrite/Utopia/Response/Model/BaseList.php
index 8328853c68..f3fa35abfb 100644
--- a/src/Appwrite/Utopia/Response/Model/BaseList.php
+++ b/src/Appwrite/Utopia/Response/Model/BaseList.php
@@ -58,7 +58,7 @@ class BaseList extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Collection.php b/src/Appwrite/Utopia/Response/Model/Collection.php
index a8acb47688..57b185ee19 100644
--- a/src/Appwrite/Utopia/Response/Model/Collection.php
+++ b/src/Appwrite/Utopia/Response/Model/Collection.php
@@ -61,7 +61,7 @@ class Collection extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Continent.php b/src/Appwrite/Utopia/Response/Model/Continent.php
index b7311d0d48..2d12f9d6a6 100644
--- a/src/Appwrite/Utopia/Response/Model/Continent.php
+++ b/src/Appwrite/Utopia/Response/Model/Continent.php
@@ -36,7 +36,7 @@ class Continent extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Country.php b/src/Appwrite/Utopia/Response/Model/Country.php
index 3c9eb6b6e1..1595aea75f 100644
--- a/src/Appwrite/Utopia/Response/Model/Country.php
+++ b/src/Appwrite/Utopia/Response/Model/Country.php
@@ -36,7 +36,7 @@ class Country extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Currency.php b/src/Appwrite/Utopia/Response/Model/Currency.php
index 10d0d77ff5..d6f9a6b166 100644
--- a/src/Appwrite/Utopia/Response/Model/Currency.php
+++ b/src/Appwrite/Utopia/Response/Model/Currency.php
@@ -66,7 +66,7 @@ class Currency extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Document.php b/src/Appwrite/Utopia/Response/Model/Document.php
index b69fe5b15f..bb03daacc3 100644
--- a/src/Appwrite/Utopia/Response/Model/Document.php
+++ b/src/Appwrite/Utopia/Response/Model/Document.php
@@ -17,7 +17,7 @@ class Document extends Any
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Domain.php b/src/Appwrite/Utopia/Response/Model/Domain.php
index 20ee9b853e..9bd665fa2c 100644
--- a/src/Appwrite/Utopia/Response/Model/Domain.php
+++ b/src/Appwrite/Utopia/Response/Model/Domain.php
@@ -65,7 +65,7 @@ class Domain extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Error.php b/src/Appwrite/Utopia/Response/Model/Error.php
index 118e405d86..507b252093 100644
--- a/src/Appwrite/Utopia/Response/Model/Error.php
+++ b/src/Appwrite/Utopia/Response/Model/Error.php
@@ -42,7 +42,7 @@ class Error extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/ErrorDev.php b/src/Appwrite/Utopia/Response/Model/ErrorDev.php
index 779314e594..abe2229ea0 100644
--- a/src/Appwrite/Utopia/Response/Model/ErrorDev.php
+++ b/src/Appwrite/Utopia/Response/Model/ErrorDev.php
@@ -39,7 +39,7 @@ class ErrorDev extends Error
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Execution.php b/src/Appwrite/Utopia/Response/Model/Execution.php
index 7f3fe19246..6af13ce710 100644
--- a/src/Appwrite/Utopia/Response/Model/Execution.php
+++ b/src/Appwrite/Utopia/Response/Model/Execution.php
@@ -85,7 +85,7 @@ class Execution extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/File.php b/src/Appwrite/Utopia/Response/Model/File.php
index 345093dc25..60acfc9208 100644
--- a/src/Appwrite/Utopia/Response/Model/File.php
+++ b/src/Appwrite/Utopia/Response/Model/File.php
@@ -67,7 +67,7 @@ class File extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Func.php b/src/Appwrite/Utopia/Response/Model/Func.php
index 1ea91757c3..36c731548f 100644
--- a/src/Appwrite/Utopia/Response/Model/Func.php
+++ b/src/Appwrite/Utopia/Response/Model/Func.php
@@ -110,7 +110,7 @@ class Func extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/FuncPermissions.php b/src/Appwrite/Utopia/Response/Model/FuncPermissions.php
index 22ee62b759..9db748e622 100644
--- a/src/Appwrite/Utopia/Response/Model/FuncPermissions.php
+++ b/src/Appwrite/Utopia/Response/Model/FuncPermissions.php
@@ -31,7 +31,7 @@ class FuncPermissions extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/HealthAntiVirus.php b/src/Appwrite/Utopia/Response/Model/HealthAntivirus.php
similarity index 100%
rename from src/Appwrite/Utopia/Response/Model/HealthAntiVirus.php
rename to src/Appwrite/Utopia/Response/Model/HealthAntivirus.php
diff --git a/src/Appwrite/Utopia/Response/Model/HealthQueue.php b/src/Appwrite/Utopia/Response/Model/HealthQueue.php
index 49d5ccf9c1..04120a1ade 100644
--- a/src/Appwrite/Utopia/Response/Model/HealthQueue.php
+++ b/src/Appwrite/Utopia/Response/Model/HealthQueue.php
@@ -30,7 +30,7 @@ class HealthQueue extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/HealthStatus.php b/src/Appwrite/Utopia/Response/Model/HealthStatus.php
index 4414b7b8e8..2887c3c4d7 100644
--- a/src/Appwrite/Utopia/Response/Model/HealthStatus.php
+++ b/src/Appwrite/Utopia/Response/Model/HealthStatus.php
@@ -36,7 +36,7 @@ class HealthStatus extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/HealthTime.php b/src/Appwrite/Utopia/Response/Model/HealthTime.php
index 95f9c315dd..2bd666ed26 100644
--- a/src/Appwrite/Utopia/Response/Model/HealthTime.php
+++ b/src/Appwrite/Utopia/Response/Model/HealthTime.php
@@ -42,7 +42,7 @@ class HealthTime extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/JWT.php b/src/Appwrite/Utopia/Response/Model/JWT.php
index b30f51702c..5777479910 100644
--- a/src/Appwrite/Utopia/Response/Model/JWT.php
+++ b/src/Appwrite/Utopia/Response/Model/JWT.php
@@ -29,7 +29,7 @@ class JWT extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Key.php b/src/Appwrite/Utopia/Response/Model/Key.php
index bca3ba7f96..c01136d24f 100644
--- a/src/Appwrite/Utopia/Response/Model/Key.php
+++ b/src/Appwrite/Utopia/Response/Model/Key.php
@@ -54,7 +54,7 @@ class Key extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Language.php b/src/Appwrite/Utopia/Response/Model/Language.php
index 77a115ab69..e56dd7a744 100644
--- a/src/Appwrite/Utopia/Response/Model/Language.php
+++ b/src/Appwrite/Utopia/Response/Model/Language.php
@@ -42,7 +42,7 @@ class Language extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Locale.php b/src/Appwrite/Utopia/Response/Model/Locale.php
index c725d65f97..292ea1d82d 100644
--- a/src/Appwrite/Utopia/Response/Model/Locale.php
+++ b/src/Appwrite/Utopia/Response/Model/Locale.php
@@ -66,7 +66,7 @@ class Locale extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Log.php b/src/Appwrite/Utopia/Response/Model/Log.php
index 8d987c8668..87c07f4141 100644
--- a/src/Appwrite/Utopia/Response/Model/Log.php
+++ b/src/Appwrite/Utopia/Response/Model/Log.php
@@ -126,7 +126,7 @@ class Log extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Membership.php b/src/Appwrite/Utopia/Response/Model/Membership.php
index 419eeac3eb..2ea309ab36 100644
--- a/src/Appwrite/Utopia/Response/Model/Membership.php
+++ b/src/Appwrite/Utopia/Response/Model/Membership.php
@@ -79,7 +79,7 @@ class Membership extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Mock.php b/src/Appwrite/Utopia/Response/Model/Mock.php
index 3490421526..ae3030828c 100644
--- a/src/Appwrite/Utopia/Response/Model/Mock.php
+++ b/src/Appwrite/Utopia/Response/Model/Mock.php
@@ -30,7 +30,7 @@ class Mock extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/None.php b/src/Appwrite/Utopia/Response/Model/None.php
index 956ba0b723..78d990ea1b 100644
--- a/src/Appwrite/Utopia/Response/Model/None.php
+++ b/src/Appwrite/Utopia/Response/Model/None.php
@@ -23,7 +23,7 @@ class None extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Permissions.php b/src/Appwrite/Utopia/Response/Model/Permissions.php
index a173c6db8c..7a52ce358d 100644
--- a/src/Appwrite/Utopia/Response/Model/Permissions.php
+++ b/src/Appwrite/Utopia/Response/Model/Permissions.php
@@ -38,7 +38,7 @@ class Permissions extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Phone.php b/src/Appwrite/Utopia/Response/Model/Phone.php
index 5f1153a76b..744f90372f 100644
--- a/src/Appwrite/Utopia/Response/Model/Phone.php
+++ b/src/Appwrite/Utopia/Response/Model/Phone.php
@@ -42,7 +42,7 @@ class Phone extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Platform.php b/src/Appwrite/Utopia/Response/Model/Platform.php
index f48f9890a1..0377b0cafc 100644
--- a/src/Appwrite/Utopia/Response/Model/Platform.php
+++ b/src/Appwrite/Utopia/Response/Model/Platform.php
@@ -76,7 +76,7 @@ class Platform extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Preferences.php b/src/Appwrite/Utopia/Response/Model/Preferences.php
index c95c13710f..68e1781633 100644
--- a/src/Appwrite/Utopia/Response/Model/Preferences.php
+++ b/src/Appwrite/Utopia/Response/Model/Preferences.php
@@ -22,7 +22,7 @@ class Preferences extends Any
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Project.php b/src/Appwrite/Utopia/Response/Model/Project.php
index 7adadfb87a..8befc0aa58 100644
--- a/src/Appwrite/Utopia/Response/Model/Project.php
+++ b/src/Appwrite/Utopia/Response/Model/Project.php
@@ -184,7 +184,7 @@ class Project extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Rule.php b/src/Appwrite/Utopia/Response/Model/Rule.php
index 018ab5afc7..4e2b8feab7 100644
--- a/src/Appwrite/Utopia/Response/Model/Rule.php
+++ b/src/Appwrite/Utopia/Response/Model/Rule.php
@@ -78,7 +78,7 @@ class Rule extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Session.php b/src/Appwrite/Utopia/Response/Model/Session.php
index 81b975fb78..bb7b039ef1 100644
--- a/src/Appwrite/Utopia/Response/Model/Session.php
+++ b/src/Appwrite/Utopia/Response/Model/Session.php
@@ -156,7 +156,7 @@ class Session extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Tag.php b/src/Appwrite/Utopia/Response/Model/Tag.php
index 27c80c1c27..9540201048 100644
--- a/src/Appwrite/Utopia/Response/Model/Tag.php
+++ b/src/Appwrite/Utopia/Response/Model/Tag.php
@@ -54,7 +54,7 @@ class Tag extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Task.php b/src/Appwrite/Utopia/Response/Model/Task.php
index c4080a1123..ab2f69edab 100644
--- a/src/Appwrite/Utopia/Response/Model/Task.php
+++ b/src/Appwrite/Utopia/Response/Model/Task.php
@@ -126,7 +126,7 @@ class Task extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Team.php b/src/Appwrite/Utopia/Response/Model/Team.php
index 8d68316ab9..5f2eafe63a 100644
--- a/src/Appwrite/Utopia/Response/Model/Team.php
+++ b/src/Appwrite/Utopia/Response/Model/Team.php
@@ -48,7 +48,7 @@ class Team extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Token.php b/src/Appwrite/Utopia/Response/Model/Token.php
index df812a51ad..84dc467734 100644
--- a/src/Appwrite/Utopia/Response/Model/Token.php
+++ b/src/Appwrite/Utopia/Response/Model/Token.php
@@ -48,7 +48,7 @@ class Token extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/User.php b/src/Appwrite/Utopia/Response/Model/User.php
index 8421c46ce1..035c9ffff2 100644
--- a/src/Appwrite/Utopia/Response/Model/User.php
+++ b/src/Appwrite/Utopia/Response/Model/User.php
@@ -72,7 +72,7 @@ class User extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/src/Appwrite/Utopia/Response/Model/Webhook.php b/src/Appwrite/Utopia/Response/Model/Webhook.php
index fe3ce84898..14f45164a6 100644
--- a/src/Appwrite/Utopia/Response/Model/Webhook.php
+++ b/src/Appwrite/Utopia/Response/Model/Webhook.php
@@ -72,7 +72,7 @@ class Webhook extends Model
     }
 
     /**
-     * Get Collection
+     * Get Type
      *
      * @return string
      */
diff --git a/tests/e2e/Services/Health/HealthCustomServerTest.php b/tests/e2e/Services/Health/HealthCustomServerTest.php
index ee1c4eeadc..c55de373a3 100644
--- a/tests/e2e/Services/Health/HealthCustomServerTest.php
+++ b/tests/e2e/Services/Health/HealthCustomServerTest.php
@@ -223,7 +223,7 @@ class HealthCustomServerTest extends Scope
         return [];
     }
 
-    public function testStorageAntiVirusSuccess():array
+    public function testStorageAntivirusSuccess():array
     {
         /**
          * Test for SUCCESS