diff --git a/app/Livewire/Project/Database/Health.php b/app/Livewire/Project/Database/Health.php
index 535e73689..8943e6316 100644
--- a/app/Livewire/Project/Database/Health.php
+++ b/app/Livewire/Project/Database/Health.php
@@ -66,7 +66,7 @@ class Health extends Component
             $this->authorize('update', $this->database);
             $this->syncData(true);
             $updateSuccessful = true;
-            $this->dispatch('success', 'Health check updated. Restart the database to apply the changes.');
+            $this->dispatch('success', 'Healthcheck updated. Restart the database to apply the changes.');
         } catch (\Throwable $e) {
             handleError($e, $this);
         }
@@ -87,7 +87,7 @@ class Health extends Component
             $this->healthCheckEnabled = ! $this->healthCheckEnabled;
             $this->syncData(true);
             $updateSuccessful = true;
-            $this->dispatch('success', 'Health check '.($this->healthCheckEnabled ? 'enabled' : 'disabled').'. Restart the database to apply the changes.');
+            $this->dispatch('success', 'Healthcheck '.($this->healthCheckEnabled ? 'enabled' : 'disabled').'. Restart the database to apply the changes.');
         } catch (\Throwable $e) {
             handleError($e, $this);
         }
diff --git a/app/Livewire/Project/Shared/HealthChecks.php b/app/Livewire/Project/Shared/HealthChecks.php
index cb60a3f39..6a128a142 100644
--- a/app/Livewire/Project/Shared/HealthChecks.php
+++ b/app/Livewire/Project/Shared/HealthChecks.php
@@ -151,7 +151,7 @@ class HealthChecks extends Component
         $this->resource->health_check_start_period = $this->healthCheckStartPeriod;
         $this->resource->custom_healthcheck_found = $this->customHealthcheckFound;
         $this->resource->save();
-        $this->dispatch('success', 'Health check updated.');
+        $this->dispatch('success', 'Healthcheck updated.');
         $this->dispatch('configurationChanged');
     }
 
@@ -178,7 +178,7 @@ class HealthChecks extends Component
             $this->resource->health_check_start_period = $this->healthCheckStartPeriod;
             $this->resource->custom_healthcheck_found = $this->customHealthcheckFound;
             $this->resource->save();
-            $this->dispatch('success', 'Health check updated.');
+            $this->dispatch('success', 'Healthcheck updated.');
             $this->dispatch('configurationChanged');
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -211,9 +211,9 @@ class HealthChecks extends Component
             $this->resource->save();
 
             if ($this->healthCheckEnabled && ! $wasEnabled && $this->resource->isRunning()) {
-                $this->dispatch('info', 'Health check has been enabled. A restart is required to apply the new settings.');
+                $this->dispatch('info', 'Healthcheck has been enabled. A restart is required to apply the new settings.');
             } else {
-                $this->dispatch('success', 'Health check '.($this->healthCheckEnabled ? 'enabled' : 'disabled').'.');
+                $this->dispatch('success', 'Healthcheck '.($this->healthCheckEnabled ? 'enabled' : 'disabled').'.');
             }
             $this->dispatch('configurationChanged');
         } catch (\Throwable $e) {
diff --git a/resources/views/components/status-summary.blade.php b/resources/views/components/status-summary.blade.php
index b64d986a2..aee198a52 100644
--- a/resources/views/components/status-summary.blade.php
+++ b/resources/views/components/status-summary.blade.php
@@ -39,8 +39,8 @@
         $healthType === 'error' => ['Degraded', 'error'],
         $containerType === 'warning' => [$containerLabel, 'warning'],
         $monitoringExcluded => ["{$containerLabel} (monitoring disabled)", 'warning'],
-        $healthStatus === 'starting' => ["{$containerLabel} (health check starting)", 'warning'],
-        $healthType === 'warning' => ["{$containerLabel} (no health check)", 'warning'],
+        $healthStatus === 'starting' => ["{$containerLabel} (healthcheck starting)", 'warning'],
+        $healthType === 'warning' => ["{$containerLabel} (no healthcheck)", 'warning'],
         default => [$containerLabel, 'success'],
     };
 @endphp
@@ -81,12 +81,12 @@
                 'bg-warning' => $healthType === 'warning',
                 'bg-error' => $healthType === 'error',
             ])></span>
-            <span class="flex-1">Health check</span>
+            <span class="flex-1">Healthcheck</span>
             <span class="inline-flex items-center gap-1.5">
                 {{ $healthLabel }}
                 @if ($healthLabel === 'Not configured')
-                    <x-helper label="About unconfigured health checks"
-                        helper="No health check is configured, so Coolify can only report the container state. Traffic can still be routed to the container, but Coolify cannot verify that the application inside it is ready to receive requests." />
+                    <x-helper label="About unconfigured healthchecks"
+                        helper="No healthcheck is configured, so Coolify can only report the container state. Traffic can still be routed to the container, but Coolify cannot verify that the application inside it is ready to receive requests." />
                 @endif
             </span>
         </div>
diff --git a/resources/views/components/status/running.blade.php b/resources/views/components/status/running.blade.php
index 752c1d576..cc098bedb 100644
--- a/resources/views/components/status/running.blade.php
+++ b/resources/views/components/status/running.blade.php
@@ -33,7 +33,7 @@
             <x-helper
                 helper="No health check configured. <span class='dark:text-warning text-coollabs'>The resource may be functioning normally.</span><br><br>Traefik and Caddy will route traffic to this container even without a health check. However, configuring a health check is recommended to ensure the resource is ready before receiving traffic.<br><br>More details in the <a href='https://coolify.io/docs/knowledge-base/proxy/traefik/healthchecks' class='underline dark:text-warning text-coollabs' target='_blank'>documentation</a>.">
                 <x-slot:icon>
-                    <x-status-badge status="No health check" type="warning" class="cursor-help" />
+                    <x-status-badge status="No healthcheck" type="warning" class="cursor-help" />
                 </x-slot:icon>
             </x-helper>
         </div>
diff --git a/resources/views/livewire/project/database/health.blade.php b/resources/views/livewire/project/database/health.blade.php
index e72858c18..3c6ecc741 100644
--- a/resources/views/livewire/project/database/health.blade.php
+++ b/resources/views/livewire/project/database/health.blade.php
@@ -7,7 +7,7 @@
             @if (!$healthCheckEnabled)
                 <x-modal-confirmation title="Enable healthcheck?" buttonTitle="Enable healthcheck"
                     submitAction="toggleHealthcheck" :actions="['Enable healthcheck for this database.']"
-                    warningMessage="A failing probe marks the database unhealthy. Review the health check guide before enabling it."
+                    warningMessage="A failing probe marks the database unhealthy. Review the healthcheck guide before enabling it."
                     step2ButtonText="Enable healthcheck" :confirmWithText="false" :confirmWithPassword="false"
                     isHighlightedButton />
             @else
diff --git a/tests/Feature/PreviewStatusSummaryTest.php b/tests/Feature/PreviewStatusSummaryTest.php
index 38430931b..6c1713561 100644
--- a/tests/Feature/PreviewStatusSummaryTest.php
+++ b/tests/Feature/PreviewStatusSummaryTest.php
@@ -8,10 +8,10 @@ it('aggregates preview container and health check status', function () {
     expect($html)
         ->toContain('Preview status')
         ->toContain('Container')
-        ->toContain('Running (no health check)')
-        ->toContain('Health check')
+        ->toContain('Running (no healthcheck)')
+        ->toContain('Healthcheck')
         ->toContain('Not configured')
-        ->toContain('aria-label="About unconfigured health checks"')
+        ->toContain('aria-label="About unconfigured healthchecks"')
         ->toContain('class="relative inline-flex align-middle"')
         ->toContain('Traffic can still be routed to the container')
         ->toContain('aria-haspopup="menu"')