diff --git a/packages/elixir-client/lib/electric/client/stream.ex b/packages/elixir-client/lib/electric/client/stream.ex
index 3407c45834..50c69c976c 100644
--- a/packages/elixir-client/lib/electric/client/stream.ex
+++ b/packages/elixir-client/lib/electric/client/stream.ex
@@ -172,7 +172,7 @@ defmodule Electric.Client.Stream do
   #      deleted. We should start from scratch, this will force the shape to be
   #      recreated
   # 409: Upon receiving a 409, we should start from scratch with the newly
-  #      provided shape ID
+  #      provided shape handle
   defp handle_response({:error, %Fetch.Response{status: status} = resp}, stream)
        when status in [400, 409] do
     %{value_mapper_fun: value_mapper_fun} = stream
diff --git a/packages/sync-service/lib/electric/plug/serve_shape_plug.ex b/packages/sync-service/lib/electric/plug/serve_shape_plug.ex
index 8cec022dae..e99a80dad7 100644
--- a/packages/sync-service/lib/electric/plug/serve_shape_plug.ex
+++ b/packages/sync-service/lib/electric/plug/serve_shape_plug.ex
@@ -22,8 +22,8 @@ defmodule Electric.Plug.ServeShapePlug do
   @must_refetch Jason.encode!([%{headers: %{control: "must-refetch"}}])
   @shape_definition_mismatch Jason.encode!(%{
                                message:
-                                 "The specified shape definition and ID do not match. " <>
-                                   "Please ensure the shape definition is correct or omit the shape ID from the request to obtain a new one."
+                                 "The specified shape definition and handle do not match. " <>
+                                   "Please ensure the shape definition is correct or omit the shape handle from the request to obtain a new one."
                              })
 
   defmodule Params do
diff --git a/packages/sync-service/lib/electric/shape_cache/file_storage.ex b/packages/sync-service/lib/electric/shape_cache/file_storage.ex
index 10ae209700..f9d6e328b5 100644
--- a/packages/sync-service/lib/electric/shape_cache/file_storage.ex
+++ b/packages/sync-service/lib/electric/shape_cache/file_storage.ex
@@ -110,7 +110,7 @@ defmodule Electric.ShapeCache.FileStorage do
         :ok
 
       {:error, :eexist} ->
-        # file already exists - by virtue of the shape ID being the hash of the
+        # file already exists - by virtue of the shape handle being the hash of the
         # definition we do not need to compare them
         :ok
 
diff --git a/packages/sync-service/test/electric/plug/router_test.exs b/packages/sync-service/test/electric/plug/router_test.exs
index c961406b92..f21ccaaeb6 100644
--- a/packages/sync-service/test/electric/plug/router_test.exs
+++ b/packages/sync-service/test/electric/plug/router_test.exs
@@ -781,7 +781,7 @@ defmodule Electric.Plug.RouterTest do
       assert conn.resp_body ==
                Jason.encode!(%{
                  message:
-                   "The specified shape definition and ID do not match. Please ensure the shape definition is correct or omit the shape ID from the request to obtain a new one."
+                   "The specified shape definition and handle do not match. Please ensure the shape definition is correct or omit the shape handle from the request to obtain a new one."
                })
     end
 
diff --git a/packages/sync-service/test/electric/plug/serve_shape_plug_test.exs b/packages/sync-service/test/electric/plug/serve_shape_plug_test.exs
index d25eacf505..527bfd0252 100644
--- a/packages/sync-service/test/electric/plug/serve_shape_plug_test.exs
+++ b/packages/sync-service/test/electric/plug/serve_shape_plug_test.exs
@@ -609,8 +609,8 @@ defmodule Electric.Plug.ServeShapePlugTest do
 
       assert Jason.decode!(conn.resp_body) == %{
                "message" =>
-                 "The specified shape definition and ID do not match." <>
-                   " Please ensure the shape definition is correct or omit the shape ID from the request to obtain a new one."
+                 "The specified shape definition and handle do not match." <>
+                   " Please ensure the shape definition is correct or omit the shape handle from the request to obtain a new one."
              }
     end