diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/latestDepTest/groovy/ApacheHttpClientTest.groovy b/dd-java-agent/instrumentation/apache-httpclient-4/src/latestDepTest/groovy/ApacheHttpClientTest.groovy
index 0d6327fe65..b77e34d627 100644
--- a/dd-java-agent/instrumentation/apache-httpclient-4/src/latestDepTest/groovy/ApacheHttpClientTest.groovy
+++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/latestDepTest/groovy/ApacheHttpClientTest.groovy
@@ -197,7 +197,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     trace.span(index) {
       childOf parent
       serviceName "unnamed-java-app"
-      operationName "apache.http.request"
+      operationName "http.request"
       resourceName "GET /$route"
       errored exception != null
       tags {
diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
index be073862f1..1c88f1128b 100644
--- a/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java
@@ -91,7 +91,7 @@ public class ApacheHttpClientInstrumentation extends Instrumenter.Default {
       final Tracer tracer = GlobalTracer.get();
       final Scope scope =
           tracer
-              .buildSpan("apache.http.request")
+              .buildSpan("http.request")
               .withTag(Tags.COMPONENT.getKey(), "apache-httpclient")
               .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
               .withTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_CLIENT)
diff --git a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy
index 730827c046..7eb08c933b 100644
--- a/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy
+++ b/dd-java-agent/instrumentation/apache-httpclient-4/src/test/groovy/ApacheHttpClientTest.groovy
@@ -117,7 +117,7 @@ class ApacheHttpClientTest extends AgentTestRunner {
     trace.span(index) {
       childOf parent
       serviceName "unnamed-java-app"
-      operationName "apache.http.request"
+      operationName "http.request"
       resourceName "GET /$route"
       errored exception != null
       tags {
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy
index a4f10e8183..4a91492656 100644
--- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy
+++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/test/groovy/AWSClientTest.groovy
@@ -77,7 +77,7 @@ class AWSClientTest extends AgentTestRunner {
     assertTraces(TEST_WRITER, 2) {
       trace(0, 1) {
         span(0) {
-          operationName "apache.http.request"
+          operationName "http.request"
           resourceName "$method /$url"
           errored false
           parent() // FIXME: This should be a child of the aws.http call.
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.106/src/test/groovy/AWSClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-1.11.106/src/test/groovy/AWSClientTest.groovy
index b3e9ac9ca0..88dac306c3 100644
--- a/dd-java-agent/instrumentation/aws-java-sdk-1.11.106/src/test/groovy/AWSClientTest.groovy
+++ b/dd-java-agent/instrumentation/aws-java-sdk-1.11.106/src/test/groovy/AWSClientTest.groovy
@@ -106,7 +106,7 @@ class AWSClientTest extends AgentTestRunner {
     assertTraces(TEST_WRITER, 2) {
       trace(0, 1) {
         span(0) {
-          operationName "apache.http.request"
+          operationName "http.request"
           resourceName "$method /$url"
           errored false
           parent() // FIXME: This should be a child of the aws.http call.