diff --git a/lib/commanded/aggregate.ex b/lib/commanded/aggregate.ex
index 0b98088..3fa7f63 100644
--- a/lib/commanded/aggregate.ex
+++ b/lib/commanded/aggregate.ex
@@ -1,12 +1,10 @@
 defmodule OpentelemetryCommanded.Aggregate do
   @moduledoc false
 
-  require OpenTelemetry.Span
   require OpenTelemetry.Tracer
 
   import OpentelemetryCommanded.Util
 
-  alias OpenTelemetry.Span
   alias OpenTelemetry.Tracer
 
   def setup do
@@ -56,12 +54,12 @@ defmodule OpentelemetryCommanded.Aggregate do
 
   def handle_stop(_event, _measurements, meta, _) do
     events = Map.get(meta, :events, [])
-    Span.set_attribute(:"event.count", Enum.count(events))
+    Tracer.set_attribute(:"event.count", Enum.count(events))
     Tracer.end_span()
   end
 
   def handle_exception(_event, _measurements, meta, _) do
-    Span.set_attributes(error: true, "error.exception": inspect(meta[:error]))
+    Tracer.set_attributes(error: true, "error.exception": inspect(meta[:error]))
     Tracer.end_span()
   end
 end
diff --git a/lib/commanded/application.ex b/lib/commanded/application.ex
index 2692d25..03ae131 100644
--- a/lib/commanded/application.ex
+++ b/lib/commanded/application.ex
@@ -1,12 +1,10 @@
 defmodule OpentelemetryCommanded.Application do
   @moduledoc false
 
-  require OpenTelemetry.Span
   require OpenTelemetry.Tracer
 
   import OpentelemetryCommanded.Util
 
-  alias OpenTelemetry.Span
   alias OpenTelemetry.Tracer
 
   def setup do
@@ -46,7 +44,7 @@ defmodule OpentelemetryCommanded.Application do
 
   def handle_stop(_event, _measurements, meta, _) do
     if error = meta[:error] do
-      Span.set_attribute(:error, error)
+      Tracer.set_attribute(:error, error)
     end
 
     Tracer.end_span()
diff --git a/lib/commanded/event_handler.ex b/lib/commanded/event_handler.ex
index 9e69a83..72407ba 100644
--- a/lib/commanded/event_handler.ex
+++ b/lib/commanded/event_handler.ex
@@ -1,11 +1,10 @@
 defmodule OpentelemetryCommanded.EventHandler do
   @moduledoc false
 
-  require OpenTelemetry.Span
   require OpenTelemetry.Tracer
 
   import OpentelemetryCommanded.Util
-  alias OpenTelemetry.Span
+
   alias OpenTelemetry.Tracer
 
   def setup do
@@ -64,7 +63,7 @@ defmodule OpentelemetryCommanded.EventHandler do
   end
 
   def handle_exception(_event, _measurements, _meta, _) do
-    Span.set_attribute(:error, true)
+    Tracer.set_attribute(:error, true)
     Tracer.end_span()
   end
 end
diff --git a/lib/commanded/process_manager.ex b/lib/commanded/process_manager.ex
index 46865e2..1ca8e10 100644
--- a/lib/commanded/process_manager.ex
+++ b/lib/commanded/process_manager.ex
@@ -1,12 +1,10 @@
 defmodule OpentelemetryCommanded.ProcessManager do
   @moduledoc false
 
-  require OpenTelemetry.Span
   require OpenTelemetry.Tracer
 
   import OpentelemetryCommanded.Util
 
-  alias OpenTelemetry.Span
   alias OpenTelemetry.Tracer
 
   def setup do
@@ -58,12 +56,12 @@ defmodule OpentelemetryCommanded.ProcessManager do
 
   def handle_stop(_event, _measurements, meta, _) do
     commands = Map.get(meta, :commands, [])
-    Span.set_attribute(:"command.count", Enum.count(commands))
+    Tracer.set_attribute(:"command.count", Enum.count(commands))
     Tracer.end_span()
   end
 
   def handle_exception(_event, _measurements, meta, _) do
-    Span.set_attributes(error: true, "error.exception": inspect(meta[:error]))
+    Tracer.set_attributes(error: true, "error.exception": inspect(meta[:error]))
     Tracer.end_span()
   end
 end