diff --git a/lib/chef/node_map.rb b/lib/chef/node_map.rb
index <HASH>..<HASH> 100644
--- a/lib/chef/node_map.rb
+++ b/lib/chef/node_map.rb
@@ -38,12 +38,12 @@
 class Chef
   class NodeMap
     COLLISION_WARNING_14 = <<~EOH.gsub(/\s+/, " ").strip
-      %{type_caps} %{key} from a cookbook is overriding the %{type} from core.  Please upgrade your cookbook
+      %{type_caps} %{key} from a cookbook is overriding the %{type} from the client.  Please upgrade your cookbook
         or remove the cookbook from your run_list before the next major release of Chef.
 EOH
 
     COLLISION_WARNING_15 = <<~EOH.gsub(/\s+/, " ").strip
-      %{type_caps} %{key} from core is overriding the %{type} from a cookbook.  Please upgrade your cookbook
+      %{type_caps} %{key} from the client is overriding the %{type} from a cookbook.  Please upgrade your cookbook
         or remove the cookbook from your run_list.
 EOH
replace "core" with "the client"

because users don't grok "core"