diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle
index 469aff39b1c..a387c17d067 100644
--- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle
+++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/build.gradle
@@ -40,7 +40,7 @@ dependencies {
   iastIntegrationTestImplementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0'
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'))
-  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet'))
+  iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-lang'))
   iastIntegrationTestRuntimeOnly(project(':dd-java-agent:instrumentation:java-net'))
   iastIntegrationTestRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
index e6e9c6bc505..71fd2913754 100644
--- a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
+++ b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
@@ -77,9 +77,9 @@ dependencies {
   jetty9LatestDepTestImplementation "org.eclipse.jetty:jetty-servlet:9.+",  {
     exclude group: 'org.slf4j', module: 'slf4j-api'
   }
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   testImplementation testFixtures(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))
 
   testImplementation(project(':dd-java-agent:instrumentation-testing')) {
@@ -90,8 +90,8 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
   testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
 
 }
diff --git a/dd-java-agent/instrumentation/dropwizard/build.gradle b/dd-java-agent/instrumentation/dropwizard/build.gradle
index b51df8d5a3f..56c209279cb 100644
--- a/dd-java-agent/instrumentation/dropwizard/build.gradle
+++ b/dd-java-agent/instrumentation/dropwizard/build.gradle
@@ -4,7 +4,7 @@ apply from: "$rootDir/gradle/java.gradle"
 
 dependencies {
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2')
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
   // Don't want to conflict with jetty from the test server.
   testImplementation(project(':dd-java-agent:instrumentation-testing')) {
diff --git a/dd-java-agent/instrumentation/glassfish-3.0/build.gradle b/dd-java-agent/instrumentation/glassfish-3.0/build.gradle
index 8255c5c4b34..59bb2785a5d 100644
--- a/dd-java-agent/instrumentation/glassfish-3.0/build.gradle
+++ b/dd-java-agent/instrumentation/glassfish-3.0/build.gradle
@@ -19,7 +19,7 @@ addTestSuiteForDir('latestDepTest', 'test')
 dependencies {
   testImplementation libs.guava
   testImplementation group: 'org.glassfish.main.extras', name: 'glassfish-embedded-all', version: '4.0'
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:grizzly:grizzly-2.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:grizzly:grizzly-http-2.3.20')
 
diff --git a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle
index 33c07aa6e82..7ede10750bf 100644
--- a/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle
+++ b/dd-java-agent/instrumentation/jakarta-rs-annotations-3/build.gradle
@@ -25,7 +25,7 @@ tasks.named("latestDepJava11Test") {
 dependencies {
   compileOnly group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.0.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '3.0.0'
   testImplementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '3.0.0'
 
diff --git a/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle b/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle
index 012d4e239bd..24a7d8fdc9d 100644
--- a/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle
+++ b/dd-java-agent/instrumentation/jax-rs-annotations-2/build.gradle
@@ -27,7 +27,7 @@ addTestSuite('nestedTest')
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'javax.ws.rs-api', version: '2.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-jersey')
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-resteasy-3.0')
   testImplementation project(':dd-java-agent:instrumentation:jax-rs-annotations-2:filter-resteasy-3.1')
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle
index 1294c654a37..5e1640598f2 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-11.0/build.gradle
@@ -60,10 +60,10 @@ dependencies {
     exclude group: 'org.slf4j', module: 'slf4j-api'
   }
   testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10")
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle
index f1db50816ec..853cc9b594e 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/build.gradle
@@ -74,8 +74,8 @@ dependencies {
   }
 
   testImplementation(project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10")
@@ -83,7 +83,7 @@ dependencies {
   testRuntimeOnly project(":dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12")
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-9.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-11.0'))
   testRuntimeOnly(project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31'))
 
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle
index 8137663c16b..6434836d74b 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.0/build.gradle
@@ -25,10 +25,10 @@ dependencies {
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '7.0.0.v20091005'
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
 
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.0.+'
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.0.+'
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle
index 7b108c80c68..81790826a1f 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-7.6/build.gradle
@@ -25,8 +25,8 @@ dependencies {
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.6.0.v20120127'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.6.0.v20120127'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '7.6.0.v20120127'
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
 
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.+'
diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle
index a4059f52e52..2f89d95e72c 100644
--- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle
+++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/build.gradle
@@ -180,13 +180,13 @@ dependencies {
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: jetty9Version
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: jetty9Version
   testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-7.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-8.1.3')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-10')
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
-  testFixturesImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
+  testFixturesImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
 
   jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.2.30.v20200428'
@@ -194,14 +194,14 @@ dependencies {
   jetty92TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.2.30.v20200428'
   jetty92TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.2.30.v20200428'
   jetty92TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.2')
-  jetty92TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  jetty92TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.4.15.v20190215'
   jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.15.v20190215'
   jetty94TestImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.4.15.v20190215'
   jetty94TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.4.15.v20190215'
   jetty94TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  jetty94TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  jetty94TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.+'
   latestDepJetty9TestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.+'
@@ -209,13 +209,13 @@ dependencies {
   latestDepJetty9TestImplementation group: 'org.eclipse.jetty.websocket', name: 'javax-websocket-server-impl', version: '9.+'
 
   latestDepJetty9TestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  latestDepJetty9TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  latestDepJetty9TestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '10.+'
   latestDepTestImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '10.+'
   latestDepTestImplementation group: 'org.eclipse.jetty.websocket', name: 'websocket-javax-server', version: '10.+'
   latestDepTestImplementation project(':dd-java-agent:instrumentation:jetty:jetty-appsec:jetty-appsec-9.3')
-  latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  latestDepTestImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 }
 configurations.getByName('latestDepForkedTestRuntimeClasspath').resolutionStrategy {
   force libs.slf4j
diff --git a/dd-java-agent/instrumentation/jsp-2.3/build.gradle b/dd-java-agent/instrumentation/jsp-2.3/build.gradle
index 302b68a9d2c..05687de2566 100644
--- a/dd-java-agent/instrumentation/jsp-2.3/build.gradle
+++ b/dd-java-agent/instrumentation/jsp-2.3/build.gradle
@@ -17,7 +17,7 @@ dependencies {
   compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0'
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37
   // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in
   testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37'
diff --git a/dd-java-agent/instrumentation/liberty-20/build.gradle b/dd-java-agent/instrumentation/liberty-20/build.gradle
index 0b478d3f2af..a53999c69b8 100644
--- a/dd-java-agent/instrumentation/liberty-20/build.gradle
+++ b/dd-java-agent/instrumentation/liberty-20/build.gradle
@@ -21,7 +21,7 @@ configurations {
   register("testLogging")
 }
 
-evaluationDependsOn ':dd-java-agent:instrumentation:servlet:request-3'
+evaluationDependsOn ':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'
 
 // Since these tasks output are used in dependencies they have to be declared before, they can be configured later
 def unpackOpenLiberty = tasks.register('unpackOpenLiberty', UnpackOpenLiberty) {
@@ -35,24 +35,24 @@ dependencies {
 
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.0.1'
   compileOnly files(unpackOpenLiberty.map {it.extractedJars.get() })
-  implementation project(':dd-java-agent:instrumentation:servlet-common')
+  implementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast')
 
   testImplementation files(unpackOpenLiberty.map {it.wsServerJar.get() })
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
   testRuntimeOnly project(':dd-java-agent:instrumentation:osgi-4.3')
   testRuntimeOnly files(filterLogbackClassic.map { it.destinationDir })
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
   webappCompileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
   // compileOnly to avoid bringing all the test dependencies to the test app
   // these are to be provided by the system classloader on test time
-  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   // only the testFixtures jar (not its dependencies) and groovy should be included in the webapp
-  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))) {
+  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))) {
     transitive = false
   }
   // use the above instead of:
-  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   // because using testFixtures() causes some early evaluation of dependencies
   webappRuntimeOnly libs.groovy
 }
diff --git a/dd-java-agent/instrumentation/liberty-23/build.gradle b/dd-java-agent/instrumentation/liberty-23/build.gradle
index 05673903fbf..8a824812492 100644
--- a/dd-java-agent/instrumentation/liberty-23/build.gradle
+++ b/dd-java-agent/instrumentation/liberty-23/build.gradle
@@ -23,7 +23,7 @@ configurations {
   register("testLogging")
 }
 
-evaluationDependsOn ':dd-java-agent:instrumentation:servlet:request-5'
+evaluationDependsOn ':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'
 
 // Since these tasks output are used in dependencies they have to be declared before, they can be configured later
 def unpackOpenLiberty = tasks.register('unpackOpenLiberty', UnpackOpenLiberty) {
@@ -38,7 +38,7 @@ dependencies {
 
   compileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'
   compileOnly files(unpackOpenLiberty.map {it.extractedJars.get() })
-  implementation project(':dd-java-agent:instrumentation:servlet:request-5')
+  implementation project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
 
   testImplementation files(unpackOpenLiberty.map {it.extractedJars.get() })
   testImplementation files(unpackOpenLiberty.map {it.wsServerJar.get() })
@@ -46,19 +46,19 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:osgi-4.3')
   testRuntimeOnly files(filterLogbackClassic.map { it.destinationDir })
   testRuntimeOnly project(':dd-java-agent:instrumentation:liberty-20')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly files(shadowJar.map { it.archiveFile })
 
   webappCompileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'
   // compileOnly to avoid bringing all the test dependencies to the test app
   // these are to be provided by the system classloader on test time
-  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  webappCompileOnly testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   // only the testFixtures jar (not its dependencies) and groovy should be included in the webapp
-  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))) {
+  add("webappImplementation", testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))) {
     transitive = false
   }
   // use the above instead of:
-  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   // because using testFixtures() causes some early evaluation of dependencies
   webappRuntimeOnly libs.groovy
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/build.gradle b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle
similarity index 96%
rename from dd-java-agent/instrumentation/servlet/request-5/build.gradle
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle
index e731b0ae3b2..031239f12e4 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/build.gradle
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/build.gradle
@@ -57,10 +57,10 @@ dependencies {
   testImplementation group: 'jakarta.servlet.jsp', name: 'jakarta.servlet.jsp-api', version: '3.0.0'
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
 
-  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet-common'), {
+  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast'), {
     transitive = false
   }
-  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet:request-3'), {
+  javaxClassesToRelocate project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'), {
     transitive = false
   }
 
diff --git a/dd-java-agent/instrumentation/servlet/request-5/gradle.lockfile b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/gradle.lockfile
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastJakartaServletInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
similarity index 96%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
index 5e2b79f70e7..347d8df5235 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/IastOptOutJakartaHttpServletRequestInstrumentation.java
@@ -95,4 +95,10 @@ public static void onExit(
       }
     }
   }
+
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestCallSite.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletRequestInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpServletResponseInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaHttpSessionInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaMultipartInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletBlockingHelper.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/JakartaServletInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumAsyncContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletRequestWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/RumHttpServletResponseWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
index 22ad21ff835..72d8e2aecc7 100644
--- a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/Servlet5RequestBodyInstrumentation.java
@@ -59,4 +59,10 @@ public String[] helperClassNames() {
       "datadog.trace.instrumentation.servlet5.Servlet31InputStreamWrapper"
     };
   }
+
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/WrappedServletOutputStream.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterCallSite.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/main/java/datadog/trace/instrumentation/servlet5/jsp/JakartaJspWriterFullDetectionCallSite.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/IastJakartaServletInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/IastJakartaServletInstrumentationTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/IastJakartaServletInstrumentationTest.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/IastJakartaServletInstrumentationTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaHttpServletRequestInstrumentationTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaHttpServletResponseInstrumentationTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaJspWriterCallsiteTest.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaJspWriterCallsiteTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaJspWriterCallsiteTest.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaJspWriterCallsiteTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaJspWriterFullDetectionCallsiteTest.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaJspWriterFullDetectionCallsiteTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaJspWriterFullDetectionCallsiteTest.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaJspWriterFullDetectionCallsiteTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaMultipartInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaMultipartInstrumentationTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/JakartaMultipartInstrumentationTest.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/JakartaMultipartInstrumentationTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/RumHttpServletResponseWrapperTest.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/RumHttpServletResponseWrapperTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/groovy/RumHttpServletResponseWrapperTest.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/groovy/RumHttpServletResponseWrapperTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyContext.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyContext.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyContext.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyContext.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyHttpServlet.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyHttpServlet.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyHttpServlet.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyHttpServlet.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyRequest.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyRequest.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyRequest.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyRequest.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyResponse.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyResponse.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/DummyResponse.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/DummyResponse.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestTestSuite.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/JakartaHttpServletRequestWrapperTestSuite.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/MockPart.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/MockPart.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/MockPart.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/MockPart.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/ServletRequestTestSuite.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/test/java/foo/bar/smoketest/TestJspWriterSuite.java
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/AsyncRumServlet.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/AsyncRumServlet.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/AsyncRumServlet.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/AsyncRumServlet.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/RumServlet.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/RumServlet.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/RumServlet.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/RumServlet.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-5/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy
rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/TestServlet5.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-2/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/build.gradle
similarity index 95%
rename from dd-java-agent/instrumentation/servlet/request-2/build.gradle
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/build.gradle
index 469a2e147ff..4a68286afb9 100644
--- a/dd-java-agent/instrumentation/servlet/request-2/build.gradle
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/build.gradle
@@ -32,14 +32,14 @@ addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
   compileOnly group: 'javax.servlet', name: 'servlet-api', version: '2.2'
-  implementation project(':dd-java-agent:instrumentation:servlet-common')
+  implementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast')
 
   testImplementation(project(':dd-java-agent:instrumentation-testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
   }
   testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.0') // See if there's any conflicts.
   testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-server:jetty-server-7.6') // See if there's any conflicts.
-  testImplementation project(':dd-java-agent:instrumentation:servlet')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')
   testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.v20091005'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.v20091005'
diff --git a/dd-java-agent/instrumentation/servlet/request-2/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/gradle.lockfile
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/HttpServletRequestExtractAdapter.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Advice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
index dffdb34f158..b79df98fddf 100644
--- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/IastServlet2Instrumentation.java
@@ -69,4 +69,10 @@ public void methodAdvice(MethodTransformer transformer) {
   protected boolean isOptOutEnabled() {
     return true;
   }
+
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Advice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Decorator.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2Instrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseRedirectAdvice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusAdvice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/Servlet2ResponseStatusInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletInputStreamWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
similarity index 98%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
index 69b0f2d1e78..b19f4aa56ab 100644
--- a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestBodyInstrumentation.java
@@ -96,6 +96,12 @@ public String[] helperClassNames() {
     };
   }
 
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
+
   @SuppressWarnings("Duplicates")
   @RequiresRequestContext(RequestContextSlot.APPSEC)
   static class HttpServletGetInputStreamAdvice {
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/main/java/datadog/trace/instrumentation/servlet2/ServletRequestURIAdapter.java
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/JettyServlet2Test.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/JettyServlet2Test.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/TestServlet2.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/TestServlet2.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/TestServlet2.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/WrapperForkedTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/WrapperForkedTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/WrapperForkedTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/WrapperForkedTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/test/resources/realm.properties b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/resources/realm.properties
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-2/src/test/resources/realm.properties
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/resources/realm.properties
diff --git a/dd-java-agent/instrumentation/servlet/request-3/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle
similarity index 97%
rename from dd-java-agent/instrumentation/servlet/request-3/build.gradle
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle
index ff395baacca..3333d751262 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/build.gradle
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/build.gradle
@@ -36,7 +36,7 @@ dependencies {
   // build against 3.1 so we can wrap its additions to ServletInputStream,
   // but all the other advice in this module is still compatible with 3.0+
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
-  implementation project(':dd-java-agent:instrumentation:servlet-common')
+  implementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast')
 
   testFixturesApi(project(':dd-java-agent:instrumentation-testing')) {
     exclude group: 'org.eclipse.jetty', module: 'jetty-server'
@@ -52,7 +52,7 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5') // See if there's any conflicts.
   testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0')
-  testImplementation project(':dd-java-agent:instrumentation:servlet')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')
   testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31')
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '8.2.0.v20160908'
   testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '8.2.0.v20160908'
diff --git a/dd-java-agent/instrumentation/servlet/request-3/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/gradle.lockfile
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncDispatcherDecorator.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/FinishAsyncDispatchListener.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletExtractAdapter.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetInputStreamAdvice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/HttpServletGetReaderAdvice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
similarity index 97%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
index 96daf911f50..8b6997b3a69 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastOptOutHttpServletRequest3Instrumentation.java
@@ -107,4 +107,10 @@ public static void onExit(
       }
     }
   }
+
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Advice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
index cf6feeb9b5a..6e1d9ebdec2 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/IastServlet3Instrumentation.java
@@ -64,4 +64,10 @@ public void methodAdvice(MethodTransformer transformer) {
   protected boolean isOptOutEnabled() {
     return true;
   }
+
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/MultipartInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumAsyncContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletRequestWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/RumHttpServletResponseWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31InputStreamWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
similarity index 96%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
index 76509673a04..882b2b762bf 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet31RequestBodyInstrumentation.java
@@ -75,4 +75,10 @@ public String[] helperClassNames() {
       "datadog.trace.instrumentation.servlet3.Servlet31InputStreamWrapper"
     };
   }
+
+  @Override
+  public int order() {
+    // apply this instrumentation after the regular servlet one.
+    return 1;
+  }
 }
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Advice.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Decorator.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/Servlet3Instrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/ServletRequestURIAdapter.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/WrappedServletOutputStream.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/AbstractServlet3Test.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/AbstractServlet3Test.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServlet3Test.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServlet3Test.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServletHandlerTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServletHandlerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServletHandlerTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServletHandlerTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/MultipartInstrumentationForkedTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/MultipartInstrumentationForkedTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/MultipartInstrumentationForkedTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/MultipartInstrumentationForkedTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/RequestDispatcherServlet.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RequestDispatcherServlet.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/RequestDispatcherServlet.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RequestDispatcherServlet.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/RumHttpServletResponseWrapperTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RumHttpServletResponseWrapperTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/RumHttpServletResponseWrapperTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/RumHttpServletResponseWrapperTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/TomcatServlet3Test.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/TomcatServlet3Test.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/MockPart.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/java/foo/bar/smoketest/MockPart.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/java/foo/bar/smoketest/MockPart.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/java/foo/bar/smoketest/MockPart.java
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/resources/realm.properties b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/resources/realm.properties
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/test/resources/realm.properties
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/resources/realm.properties
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/RumServlet.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/RumServlet.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/RumServlet.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/RumServlet.groovy
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/request-3/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy
diff --git a/dd-java-agent/instrumentation/servlet/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle
similarity index 96%
rename from dd-java-agent/instrumentation/servlet/build.gradle
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle
index 394be383158..06df4bdf8b1 100644
--- a/dd-java-agent/instrumentation/servlet/build.gradle
+++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/build.gradle
@@ -22,7 +22,7 @@ dependencies {
   testImplementation group: 'javax.servlet', name: 'servlet-api', version: '2.3'
 
   // servlet request instrumentation required for linking request to response.
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-2')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
 
   // Don't want to conflict with jetty from the test server.
   testImplementation(project(':dd-java-agent:instrumentation-testing')) {
diff --git a/dd-java-agent/instrumentation/servlet/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/gradle.lockfile
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletRequestSetter.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/SpanNameCache.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/CookieInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestCallSite.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletRequestInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterCallSite.java
diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/jsp/JspWriterFullDetectionCallSite.java
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/CookieInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/CookieInstrumentationTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/CookieInstrumentationTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/CookieInstrumentationTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/FilterTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/FilterTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/FilterTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/FilterTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletRequestTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletRequestTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletRequestTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletResponseTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletResponseTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletResponseTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletResponseTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/JspWriterCallSiteTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/JspWriterCallSiteTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/JspWriterCallSiteTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/JspWriterCallSiteTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/JspWriterFullDetectionCallSiteTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/JspWriterFullDetectionCallSiteTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/JspWriterFullDetectionCallSiteTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/JspWriterFullDetectionCallSiteTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherUtils.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherUtils.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherUtils.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/RequestDispatcherUtils.java
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestTestSuite.java
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/JavaxHttpServletRequestWrapperTestSuite.java
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/datadog/smoketest/controller/ServletRequestTestSuite.java
diff --git a/dd-java-agent/instrumentation/servlet/src/test/java/foo/bar/TestJspWriterSuite.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/foo/bar/TestJspWriterSuite.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet/src/test/java/foo/bar/TestJspWriterSuite.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/java/foo/bar/TestJspWriterSuite.java
diff --git a/dd-java-agent/instrumentation/servlet-common/build.gradle b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/build.gradle
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/build.gradle
diff --git a/dd-java-agent/instrumentation/servlet-common/gradle.lockfile b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/gradle.lockfile
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/AbstractServletInputStreamWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/BufferedReaderWrapper.java
diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpServletResponseInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/HttpSessionInstrumentation.java
diff --git a/dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/main/java/datadog/trace/instrumentation/servlet/ServletBlockingHelper.java
diff --git a/dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpServletResponseInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/groovy/HttpServletResponseInstrumentationTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpServletResponseInstrumentationTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/groovy/HttpServletResponseInstrumentationTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpSessionInstrumentationTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/groovy/HttpSessionInstrumentationTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/test/groovy/HttpSessionInstrumentationTest.groovy
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/groovy/HttpSessionInstrumentationTest.groovy
diff --git a/dd-java-agent/instrumentation/servlet-common/src/test/java/foo/bar/DummyHttpSession.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyHttpSession.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/test/java/foo/bar/DummyHttpSession.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyHttpSession.java
diff --git a/dd-java-agent/instrumentation/servlet-common/src/test/java/foo/bar/DummyResponse.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyResponse.java
similarity index 100%
rename from dd-java-agent/instrumentation/servlet-common/src/test/java/foo/bar/DummyResponse.java
rename to dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-iast/src/test/java/foo/bar/DummyResponse.java
diff --git a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
index e4e3b63c255..89150b10d51 100644
--- a/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
+++ b/dd-java-agent/instrumentation/spring/spring-cloud-zuul-2.0/build.gradle
@@ -17,8 +17,8 @@ dependencies {
   compileOnly group: 'com.netflix.zuul', name: 'zuul-core', version: '1.3.1' // "optional" dependency of ^^
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet')
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation project(':dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-3.1')
 
   // These two are used need for spans to propagate correctly:
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle
index 965232b0c58..2d3f24c4d81 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle
@@ -52,9 +52,9 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:spring:spring-beans-3.1')
 
   // Include servlet instrumentation for verifying the tomcat requests
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet')
-  testImplementation project(':dd-java-agent:instrumentation:servlet-common')
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
 
   // include also tomcat instrumentation
   testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-5.5')
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle
index 22c3e8e867e..ce3ee56057c 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     exclude(module: 'jetty-server') // incompatable servlet api
   }
 
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-3')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation project(':dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-3.1')
 
   testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get()
diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle
index a4838c2d48d..b5648d089c5 100644
--- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle
+++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle
@@ -47,7 +47,7 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-7.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
-  testImplementation project(':dd-java-agent:instrumentation:servlet:request-5')
+  testImplementation project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
 
   testImplementation group: 'org.spockframework', name: 'spock-spring', version: libs.versions.spock.get()
 
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
index 42d0b3e7e65..7a07e9440b2 100644
--- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
+++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
@@ -111,18 +111,18 @@ dependencies {
   testImplementation group: 'tomcat', name: 'naming-factory', version: tomcatVersion
   testImplementation group: 'commons-modeler', name: 'commons-modeler', version: '2.0.1'
   testImplementation group: 'javax.servlet', name: 'servlet-api', version: '2.4'
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-3'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-5.5')
   testRuntimeOnly project(':dd-java-agent:instrumentation:tomcat:tomcat-appsec:tomcat-appsec-6.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
 
-  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:request-5'))
+  testImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
 
   tomcat9TestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '9.+'
   tomcat9TestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: '9.+'
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle b/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle
index 874a4b1e006..027f48ab079 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/build.gradle
@@ -38,10 +38,10 @@ dependencies {
   testImplementation group: 'io.undertow', name: 'undertow-websockets-jsr', version: '2.0.0.Final'
 
 
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
 
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle b/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle
index 9375c69892b..e5e8b6b3d99 100644
--- a/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle
+++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle
@@ -32,10 +32,10 @@ dependencies {
   testImplementation group: 'io.undertow', name: 'undertow-websockets-jsr-jakarta', version: '2.2.14.Final'
 
   testRuntimeOnly project(':dd-java-agent:instrumentation:undertow:undertow-2.0')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-2')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:javax-websocket-1.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
 
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle
index beb327ff2b3..e168e45e7ce 100644
--- a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle
+++ b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle
@@ -42,7 +42,7 @@ dependencies {
   testImplementation group: 'org.wildfly.core', name: 'wildfly-server', version: '21.1.0.Final'
   testImplementation group: 'org.jboss.shrinkwrap', name: 'shrinkwrap-api', version: '1.2.6'
 
-  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-3')
+  testRuntimeOnly project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:jboss:jboss-modules-1.3')
   testRuntimeOnly project(':dd-java-agent:instrumentation:undertow:undertow-2.0')
   testRuntimeOnly project(':dd-java-agent:instrumentation:undertow:undertow-2.2')
@@ -55,7 +55,7 @@ dependencies {
   latestDepTestImplementation group: 'org.wildfly.core', name: 'wildfly-server', version: '+'
   wildflyLatestDepTest "org.wildfly:wildfly-dist:+@zip"
 
-  latestDepTestRuntimeOnly project(':dd-java-agent:instrumentation:servlet:request-5')
+  latestDepTestRuntimeOnly project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
 }
 
 def extractWildfly(NamedDomainObjectProvider<Configuration> config, String zipFileNamePrefix, Copy sync) {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9266c19e501..8d0a2637103 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -520,11 +520,11 @@ include(
   ":dd-java-agent:instrumentation:servicetalk",
   ":dd-java-agent:instrumentation:servicetalk:servicetalk-0.42.0",
   ":dd-java-agent:instrumentation:servicetalk:servicetalk-0.42.56",
-  ":dd-java-agent:instrumentation:servlet",
-  ":dd-java-agent:instrumentation:servlet-common",
-  ":dd-java-agent:instrumentation:servlet:request-2",
-  ":dd-java-agent:instrumentation:servlet:request-3",
-  ":dd-java-agent:instrumentation:servlet:request-5",
+  ":dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-common",
+  ":dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-iast",
+  ":dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-2.2",
+  ":dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0",
+  ":dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0",
   ":dd-java-agent:instrumentation:shutdown",
   ":dd-java-agent:instrumentation:slick",
   ":dd-java-agent:instrumentation:snakeyaml",