diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
index c68dc97b07d7..72a67f9e05f2 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/InstrumenterBuilder.java
@@ -301,12 +301,12 @@ static <RQ, RS> InstrumenterConstructor<RQ, RS> internal() {
 
     static <RQ, RS> InstrumenterConstructor<RQ, RS> propagatingToDownstream(
         TextMapSetter<RQ> setter) {
-      return builder -> new ClientInstrumenter<>(builder, setter);
+      return builder -> new PropagatingToDownstreamInstrumenter<>(builder, setter);
     }
 
     static <RQ, RS> InstrumenterConstructor<RQ, RS> propagatingFromUpstream(
         TextMapGetter<RQ> getter) {
-      return builder -> new ServerInstrumenter<>(builder, getter);
+      return builder -> new PropagatingFromUpstreamInstrumenter<>(builder, getter);
     }
   }
 }
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ServerInstrumenter.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/PropagatingFromUpstreamInstrumenter.java
similarity index 86%
rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ServerInstrumenter.java
rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/PropagatingFromUpstreamInstrumenter.java
index f26a2e7e66e6..c5c1b184f208 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ServerInstrumenter.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/PropagatingFromUpstreamInstrumenter.java
@@ -10,12 +10,13 @@
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.instrumentation.api.internal.ContextPropagationDebug;
 
-final class ServerInstrumenter<REQUEST, RESPONSE> extends Instrumenter<REQUEST, RESPONSE> {
+final class PropagatingFromUpstreamInstrumenter<REQUEST, RESPONSE>
+    extends Instrumenter<REQUEST, RESPONSE> {
 
   private final ContextPropagators propagators;
   private final TextMapGetter<REQUEST> getter;
 
-  ServerInstrumenter(
+  PropagatingFromUpstreamInstrumenter(
       InstrumenterBuilder<REQUEST, RESPONSE> builder, TextMapGetter<REQUEST> getter) {
     super(builder);
     this.propagators = builder.openTelemetry.getPropagators();
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ClientInstrumenter.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/PropagatingToDownstreamInstrumenter.java
similarity index 84%
rename from instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ClientInstrumenter.java
rename to instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/PropagatingToDownstreamInstrumenter.java
index c5549ad3f5bd..2671f051f74e 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/ClientInstrumenter.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/PropagatingToDownstreamInstrumenter.java
@@ -9,12 +9,13 @@
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapSetter;
 
-final class ClientInstrumenter<REQUEST, RESPONSE> extends Instrumenter<REQUEST, RESPONSE> {
+final class PropagatingToDownstreamInstrumenter<REQUEST, RESPONSE>
+    extends Instrumenter<REQUEST, RESPONSE> {
 
   private final ContextPropagators propagators;
   private final TextMapSetter<REQUEST> setter;
 
-  ClientInstrumenter(
+  PropagatingToDownstreamInstrumenter(
       InstrumenterBuilder<REQUEST, RESPONSE> builder, TextMapSetter<REQUEST> setter) {
     super(builder);
     this.propagators = builder.openTelemetry.getPropagators();