diff --git a/internal-api/src/main/java/datadog/trace/api/TagMap.java b/internal-api/src/main/java/datadog/trace/api/TagMap.java
index 79fc79e4c4d..5d0aebaf6e9 100644
--- a/internal-api/src/main/java/datadog/trace/api/TagMap.java
+++ b/internal-api/src/main/java/datadog/trace/api/TagMap.java
@@ -45,7 +45,7 @@
  */
 public interface TagMap extends Map<String, Object>, Iterable<TagMap.Entry> {
   /** Immutable empty TagMap - similar to {@link Collections#emptyMap()} */
-  TagMap EMPTY = TagMapFactory.INSTANCE.empty();
+  static final TagMap EMPTY = TagMapFactory.INSTANCE.empty();
 
   /** Creates a new mutable TagMap that contains the contents of <code>map</code> */
   static TagMap fromMap(Map<String, ?> map) {
@@ -2688,15 +2688,14 @@ public void fillStringMap(Map<? super String, ? super String> stringMap) {
   }
 
   @Override
-  public void forEach(Consumer<? super datadog.trace.api.TagMap.Entry> consumer) {
+  public void forEach(Consumer<? super TagMap.Entry> consumer) {
     for (Map.Entry<String, Object> entry : this.entrySet()) {
       consumer.accept(TagMap.Entry.newAnyEntry(entry));
     }
   }
 
   @Override
-  public <T> void forEach(
-      T thisObj, BiConsumer<T, ? super datadog.trace.api.TagMap.Entry> consumer) {
+  public <T> void forEach(T thisObj, BiConsumer<T, ? super TagMap.Entry> consumer) {
     for (Map.Entry<String, Object> entry : this.entrySet()) {
       consumer.accept(thisObj, TagMap.Entry.newAnyEntry(entry));
     }
@@ -2704,7 +2703,7 @@ public <T> void forEach(
 
   @Override
   public <T, U> void forEach(
-      T thisObj, U otherObj, TriConsumer<T, U, ? super datadog.trace.api.TagMap.Entry> consumer) {
+      T thisObj, U otherObj, TriConsumer<T, U, ? super TagMap.Entry> consumer) {
     for (Map.Entry<String, Object> entry : this.entrySet()) {
       consumer.accept(thisObj, otherObj, TagMap.Entry.newAnyEntry(entry));
     }