diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
index 7de0a0d83..a175fa6b5 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
@@ -83,7 +83,7 @@ public interface Annotation {
      */
     Map<String, String> getDetails();
 
-    static BuilderFacets.WantsSession newBuilder() {
+    static AnnotationBuilderFacets.WantsSession newBuilder() {
         return new AnnotationBuilder();
     }
 
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
index 118eee274..c273d4696 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
@@ -20,7 +20,7 @@ import java.time.ZoneId;
 import java.util.LinkedHashMap;
 import java.util.TimeZone;
 
-public class AnnotationBuilder implements BuilderFacets.All {
+public class AnnotationBuilder implements AnnotationBuilderFacets.All {
     private String session;
     private long start;
     private long end;
@@ -75,7 +75,7 @@ public class AnnotationBuilder implements BuilderFacets.All {
     }
 
     @Override
-    public BuilderFacets.WantsMoreDetailsOrBuild detail(String name, String value) {
+    public AnnotationBuilderFacets.WantsMoreDetailsOrBuild detail(String name, String value) {
         this.details.put(name, value);
         return this;
     }
@@ -87,7 +87,7 @@ public class AnnotationBuilder implements BuilderFacets.All {
     }
 
     @Override
-    public BuilderFacets.WantsInterval session(String session) {
+    public AnnotationBuilderFacets.WantsInterval session(String session) {
         this.session = session;
         return this;
     }
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderFacets.java
similarity index 97%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
rename to nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderFacets.java
index a26afb193..32ad354eb 100644
--- a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/BuilderFacets.java
+++ b/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderFacets.java
@@ -16,7 +16,7 @@
 
 package io.nosqlbench.nb.api.annotations;
 
-public interface BuilderFacets {
+public interface AnnotationBuilderFacets {
 
     interface All extends
             WantsSession, WantsInterval, WantsLayer, WantsLabels, WantsMoreDetailsOrBuild, WantsMoreLabelsOrDetails {