diff --git a/lib/elixir/src/elixir_dispatch.erl b/lib/elixir/src/elixir_dispatch.erl
index eb1a85ce66..ea13a3b5ba 100644
--- a/lib/elixir/src/elixir_dispatch.erl
+++ b/lib/elixir/src/elixir_dispatch.erl
@@ -363,7 +363,7 @@ format_error({import, {conflict, Receiver}, Name, Arity}) ->
     "please rename the local macro or remove the conflicting import",
     [Name, Arity, elixir_aliases:inspect(Receiver), Name, Arity]);
 format_error({import, {ambiguous, [Mod1, Mod2 | _]}, Name, Arity}) ->
-  io_lib:format("function ~ts/~B imported from both ~ts and ~ts, call is ambiguous",
+  io_lib:format("conflicting ~ts/~B import from modules ~ts and ~ts",
     [Name, Arity, elixir_aliases:inspect(Mod1), elixir_aliases:inspect(Mod2)]);
 format_error({compile_env, Name, Arity}) ->
   io_lib:format("Application.~s/~B is discouraged in the module body, use Application.compile_env/3 instead", [Name, Arity]);
diff --git a/lib/elixir/test/elixir/kernel/errors_test.exs b/lib/elixir/test/elixir/kernel/errors_test.exs
index 7718b4fedc..f784870d8b 100644
--- a/lib/elixir/test/elixir/kernel/errors_test.exs
+++ b/lib/elixir/test/elixir/kernel/errors_test.exs
@@ -674,7 +674,7 @@ defmodule Kernel.ErrorsTest do
 
   test "function import conflict" do
     assert_compile_error(
-      ["nofile:3:16", "function exit/1 imported from both :erlang and Kernel, call is ambiguous"],
+      ["nofile:3:16", "conflicting exit/1 import from modules :erlang and Kernel"],
       ~c"""
       defmodule Kernel.ErrorsTest.FunctionImportConflict do
         import :erlang, only: [exit: 1], warn: false
@@ -684,7 +684,7 @@ defmodule Kernel.ErrorsTest do
     )
 
     assert_compile_error(
-      ["nofile:3:17", "function exit/1 imported from both :erlang and Kernel, call is ambiguous"],
+      ["nofile:3:17", "conflicting exit/1 import from modules :erlang and Kernel"],
       ~c"""
       defmodule Kernel.ErrorsTest.FunctionImportConflict do
         import :erlang, only: [exit: 1], warn: false
diff --git a/lib/iex/test/iex/interaction_test.exs b/lib/iex/test/iex/interaction_test.exs
index f351da9345..4ef9c71541 100644
--- a/lib/iex/test/iex/interaction_test.exs
+++ b/lib/iex/test/iex/interaction_test.exs
@@ -185,7 +185,7 @@ defmodule IEx.InteractionTest do
     assert capture_io(:stderr, fn ->
              capture_iex("open('README.md')", [], env: __ENV__)
            end) =~
-             ~r"function open/1 imported from both File and IEx.Helpers"
+             ~r"conflicting open/1 import from modules File and IEx.Helpers"
   end
 
   test "receive exit" do