diff --git a/lib/towerops_web/live/device_live/show.ex b/lib/towerops_web/live/device_live/show.ex
index 893de4bb..faaa294f 100644
--- a/lib/towerops_web/live/device_live/show.ex
+++ b/lib/towerops_web/live/device_live/show.ex
@@ -331,7 +331,7 @@ defmodule ToweropsWeb.DeviceLive.Show do
       nil
     else
       dataset = %{
-        label: "Ping Latency",
+        label: "ICMP Latency",
         data: Enum.map(checks, &latency_check_to_data_point/1)
       }
 
diff --git a/lib/towerops_web/live/device_live/show.html.heex b/lib/towerops_web/live/device_live/show.html.heex
index 867c33a6..5cd0ec73 100644
--- a/lib/towerops_web/live/device_live/show.html.heex
+++ b/lib/towerops_web/live/device_live/show.html.heex
@@ -242,7 +242,7 @@
                 </div>
               </div>
             <% end %>
-            <!-- Ping Latency Chart -->
+            <!-- ICMP Latency Chart -->
             <%= if @latency_chart_data do %>
               <div class="bg-white dark:bg-zinc-800 rounded-lg border border-zinc-200 dark:border-zinc-700">
                 <.link
@@ -253,7 +253,7 @@
                 >
                   <div class="flex items-center justify-between">
                     <h3 class="text-sm font-semibold text-zinc-900 dark:text-zinc-100">
-                      Ping Latency
+                      ICMP Latency
                     </h3>
                     <.icon name="hero-arrow-right" class="h-4 w-4 text-zinc-400" />
                   </div>
diff --git a/lib/towerops_web/live/graph_live/show.ex b/lib/towerops_web/live/graph_live/show.ex
index cc0ed1e2..4c0b23fd 100644
--- a/lib/towerops_web/live/graph_live/show.ex
+++ b/lib/towerops_web/live/graph_live/show.ex
@@ -101,7 +101,7 @@ defmodule ToweropsWeb.GraphLive.Show do
   defp get_sensor_types_for_chart("traffic"), do: nil
   defp get_sensor_types_for_chart(_), do: []
 
-  defp get_chart_config("latency"), do: {"Ping Latency", "ms", true}
+  defp get_chart_config("latency"), do: {"ICMP Latency", "ms", true}
   defp get_chart_config("processors"), do: {"Processor Usage", "%", false}
   defp get_chart_config("memory"), do: {"Memory Usage", "%", false}
   defp get_chart_config("storage"), do: {"Storage Usage", "%", false}
@@ -205,7 +205,7 @@ defmodule ToweropsWeb.GraphLive.Show do
       nil
     else
       dataset = %{
-        label: "Ping Latency",
+        label: "ICMP Latency",
         data: Enum.map(checks, &latency_check_to_chart_point/1)
       }
 
diff --git a/test/towerops_web/live/graph_live/show_test.exs b/test/towerops_web/live/graph_live/show_test.exs
index 43dfa099..3c55ef96 100644
--- a/test/towerops_web/live/graph_live/show_test.exs
+++ b/test/towerops_web/live/graph_live/show_test.exs
@@ -56,7 +56,7 @@ defmodule ToweropsWeb.GraphLive.ShowTest do
       {:ok, view, html} = live(conn, ~p"/orgs/#{org.slug}/devices/#{device.id}/graph/latency")
 
       # Verify page renders
-      assert html =~ "Ping Latency"
+      assert html =~ "ICMP Latency"
       assert html =~ device.name
 
       # Verify correct assigns are set