diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java
rename to dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumentation.java
index 98786ab6c1c..4ce7ff753ac 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumenter.java
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileuploadInstrumentation.java
@@ -22,10 +22,10 @@
 import net.bytebuddy.asm.Advice;
 
 @AutoService(InstrumenterModule.class)
-public class CommonsFileuploadInstrumenter extends InstrumenterModule.Iast
+public class CommonsFileuploadInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice {
 
-  public CommonsFileuploadInstrumenter() {
+  public CommonsFileuploadInstrumentation() {
     super("commons-fileupload");
   }
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumenter.java
rename to dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumentation.java
index af1b38899ff..6b7e7829c9a 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumenter.java
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemInstrumentation.java
@@ -22,10 +22,10 @@
 import org.apache.commons.fileupload.FileItem;
 
 @AutoService(InstrumenterModule.class)
-public class FileItemInstrumenter extends InstrumenterModule.Iast
+public class FileItemInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public FileItemInstrumenter() {
+  public FileItemInstrumentation() {
     super("commons-fileupload", "fileitem");
   }
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumenter.java
rename to dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumentation.java
index ebfa36ccfd3..35cbb52be35 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumenter.java
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemIteratorInstrumentation.java
@@ -22,10 +22,10 @@
 import org.apache.commons.fileupload.FileItemStream;
 
 @AutoService(InstrumenterModule.class)
-public class FileItemIteratorInstrumenter extends InstrumenterModule.Iast
+public class FileItemIteratorInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public FileItemIteratorInstrumenter() {
+  public FileItemIteratorInstrumentation() {
     super("commons-fileupload", "fileitemiterator");
   }
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumenter.java
rename to dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumentation.java
index e7db79e03bb..f3efb836ea4 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumenter.java
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/FileItemStreamInstrumentation.java
@@ -22,10 +22,10 @@
 import org.apache.commons.fileupload.FileItemStream;
 
 @AutoService(InstrumenterModule.class)
-public class FileItemStreamInstrumenter extends InstrumenterModule.Iast
+public class FileItemStreamInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice {
 
-  public FileItemStreamInstrumenter() {
+  public FileItemStreamInstrumentation() {
     super("commons-fileupload", "fileitemstream");
   }
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumenter.java b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumentation.java
similarity index 97%
rename from dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumenter.java
rename to dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumentation.java
index e88df36bc06..e7919fad2c5 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumenter.java
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/main/java/datadog/trace/instrumentation/commons/fileupload/ServletFileUploadInstrumentation.java
@@ -23,10 +23,10 @@
 import org.apache.commons.fileupload.FileItemIterator;
 
 @AutoService(InstrumenterModule.class)
-public class ServletFileUploadInstrumenter extends InstrumenterModule.Iast
+public class ServletFileUploadInstrumentation extends InstrumenterModule.Iast
     implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
 
-  public ServletFileUploadInstrumenter() {
+  public ServletFileUploadInstrumentation() {
     super("commons-fileupload", "servlet");
   }
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemInstrumenterTest.groovy b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemInstrumentationTest.groovy
similarity index 95%
rename from dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemInstrumenterTest.groovy
rename to dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemInstrumentationTest.groovy
index 75206dc5c97..44b513f413e 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemInstrumenterTest.groovy
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemInstrumentationTest.groovy
@@ -6,7 +6,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.bootstrap.instrumentation.api.TagContext
 import foo.bar.smoketest.MockFileItem
 
-class FileItemInstrumenterTest extends AgentTestRunner {
+class FileItemInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemIteratorInstrumenterTest.groovy b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemIteratorInstrumentationTest.groovy
similarity index 95%
rename from dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemIteratorInstrumenterTest.groovy
rename to dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemIteratorInstrumentationTest.groovy
index 830914a2d6e..4d9cff0da59 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemIteratorInstrumenterTest.groovy
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemIteratorInstrumentationTest.groovy
@@ -7,7 +7,7 @@ import datadog.trace.bootstrap.instrumentation.api.TagContext
 import foo.bar.smoketest.MockFileItemIterator
 import foo.bar.smoketest.MockFileItemStream
 
-class FileItemIteratorInstrumenterTest extends AgentTestRunner {
+class FileItemIteratorInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemStreamInstrumenterTest.groovy b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemStreamInstrumentationTest.groovy
similarity index 95%
rename from dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemStreamInstrumenterTest.groovy
rename to dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemStreamInstrumentationTest.groovy
index ec70565f52c..a8aa8bdff3c 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemStreamInstrumenterTest.groovy
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/FileItemStreamInstrumentationTest.groovy
@@ -6,7 +6,7 @@ import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.bootstrap.instrumentation.api.TagContext
 import foo.bar.smoketest.MockFileItemStream
 
-class FileItemStreamInstrumenterTest extends AgentTestRunner {
+class FileItemStreamInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx
 
diff --git a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/ServletFileUploadInstrumenterTest.groovy b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/ServletFileUploadInstrumentationTest.groovy
similarity index 98%
rename from dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/ServletFileUploadInstrumenterTest.groovy
rename to dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/ServletFileUploadInstrumentationTest.groovy
index 629da4e6a93..9cc3ddd8123 100644
--- a/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/ServletFileUploadInstrumenterTest.groovy
+++ b/dd-java-agent/instrumentation/commons-fileupload/src/test/groovy/ServletFileUploadInstrumentationTest.groovy
@@ -11,7 +11,7 @@ import org.apache.commons.fileupload.FileItemIterator
 import org.apache.commons.fileupload.disk.DiskFileItemFactory
 import org.apache.commons.fileupload.servlet.ServletFileUpload
 
-class ServletFileUploadInstrumenterTest extends AgentTestRunner {
+class ServletFileUploadInstrumentationTest extends AgentTestRunner {
 
   private Object iastCtx