diff --git a/src/Appwrite/Stats/Stats.php b/src/Appwrite/Stats/Stats.php
index 709b247666..ebd7855453 100644
--- a/src/Appwrite/Stats/Stats.php
+++ b/src/Appwrite/Stats/Stats.php
@@ -111,12 +111,12 @@ class Stats
             $this->statsd->increment('functions.executions.all' . $tags . ',functionId=' . $functionId . ',functionStatus=' . $functionStatus);
             $this->statsd->count('functions.executions.time' . $tags . ',functionId=' . $functionId, $functionExecutionTime);
         }
-        if($functionBuild >= 1) {
+        if ($functionBuild >= 1) {
             $this->statsd->increment('functions.builds.all' . $tags . ',functionId=' . $functionId . ',functionBuildStatus=' . $functionBuildStatus);
             $this->statsd->count('functions.builds.time' . $tags . ',functionId=' . $functionId, $functionExecutionTime);
         }
-        if($functionBuild + $functionExecution >= 1) {
-            $this->statsd->count('functions.compute.time' . $tags. ',functionId=' . $functionId, $functionCompute);
+        if ($functionBuild + $functionExecution >= 1) {
+            $this->statsd->count('functions.compute.time' . $tags . ',functionId=' . $functionId, $functionCompute);
         }
 
         $this->statsd->count('network.inbound' . $tags, $networkRequestSize);
diff --git a/src/Appwrite/Stats/Usage.php b/src/Appwrite/Stats/Usage.php
index 36e08b5069..4247973702 100644
--- a/src/Appwrite/Stats/Usage.php
+++ b/src/Appwrite/Stats/Usage.php
@@ -197,14 +197,14 @@ class Usage
             'table' => 'appwrite_usage_functions_compute_time',
             'groupBy' => ['functionId'],
         ],
-        'functions.functionId.failures' => [
+        'functions.functionId.executions.failures' => [
             'table' => 'appwrite_usage_functions_executions_all',
             'groupBy' => ['functionId'],
             'filters' => [
                 'functionStatus' => 'failed',
             ],
         ],
-        'functions.functionId.builds' => [
+        'functions.functionId.builds.failures' => [
             'table' => 'appwrite_usage_functions_builds_all',
             'groupBy' => ['functionId'],
             'filters' => [
diff --git a/src/Appwrite/Stats/UsageDB.php b/src/Appwrite/Stats/UsageDB.php
index 7041242f2b..3b282a81be 100644
--- a/src/Appwrite/Stats/UsageDB.php
+++ b/src/Appwrite/Stats/UsageDB.php
@@ -231,10 +231,10 @@ class UsageDB extends Usage
      */
     private function computeStats(string $projectId): void
     {
-        $executionTotal = $this->sum($projectId, 'executions', 'time', 'functions.executionTime.total');
-        $buildTotal = $this->sum($projectId, 'builds', 'duration', 'functions.buildTime.total');
+        $executionTotal = $this->sum($projectId, 'executions', 'time', 'functions.executionTime');
+        $buildTotal = $this->sum($projectId, 'builds', 'duration', 'functions.buildTime');
 
-        $this->createOrUpdateMetric($projectId, 'functions.compute.total', $executionTotal + $buildTotal);
+        $this->createOrUpdateMetric($projectId, 'functions.compute', $executionTotal + $buildTotal);
     }
 
     /**