diff --git a/plugins/gradle/java/src/execution/test/runner/GradleTestEventsProcessor.java b/plugins/gradle/java/src/execution/test/runner/GradleTestEventsProcessor.java
index 3daf4613a354..664cddcfbfe0 100644
--- a/plugins/gradle/java/src/execution/test/runner/GradleTestEventsProcessor.java
+++ b/plugins/gradle/java/src/execution/test/runner/GradleTestEventsProcessor.java
@@ -16,30 +16,30 @@ public final class GradleTestEventsProcessor {
       return;
     }
 
-    TestEvent testEvent = null;
+    TestEventProcessor testEventProcessor = null;
     switch (eventType) {
       case BEFORE_SUITE:
-        testEvent = new BeforeSuiteEvent(console);
+        testEventProcessor = new BeforeSuiteEventProcessor(console);
         break;
       case BEFORE_TEST:
-        testEvent = new BeforeTestEvent(console);
+        testEventProcessor = new BeforeTestEventProcessor(console);
         break;
       case ON_OUTPUT:
-        testEvent = new OnOutputEvent(console);
+        testEventProcessor = new OnOutputEventProcessor(console);
         break;
       case AFTER_TEST:
-        testEvent = new AfterTestEvent(console);
+        testEventProcessor = new AfterTestEventProcessor(console);
         break;
       case AFTER_SUITE:
-        testEvent = new AfterSuiteEvent(console);
+        testEventProcessor = new AfterSuiteEventProcessor(console);
         break;
       case CONFIGURATION_ERROR:
       case REPORT_LOCATION:
       case UNKNOWN_EVENT:
         break;
     }
-    if (testEvent != null) {
-      testEvent.process(event);
+    if (testEventProcessor != null) {
+      testEventProcessor.process(event);
     }
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleOutputProcessor.java b/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleOutputProcessor.java
index 55248fa77221..1f616b24c2f9 100644
--- a/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleOutputProcessor.java
+++ b/plugins/gradle/java/src/execution/test/runner/GradleTestsExecutionConsoleOutputProcessor.java
@@ -31,34 +31,34 @@ public final class GradleTestsExecutionConsoleOutputProcessor {
       final TestEventXmlView xml = new TestEventXPPXmlView(eventMessage);
 
       final TestEventType eventType = TestEventType.fromValue(xml.getTestEventType());
-      TestEvent testEvent = null;
+      TestEventProcessor testEventProcessor = null;
       switch (eventType) {
         case CONFIGURATION_ERROR:
-          testEvent = new ConfigurationErrorEvent(executionConsole);
+          testEventProcessor = new ConfigurationErrorEventProcessor(executionConsole);
           break;
         case REPORT_LOCATION:
-          testEvent = new ReportLocationEvent(executionConsole);
+          testEventProcessor = new ReportLocationEventProcessor(executionConsole);
           break;
         case BEFORE_TEST:
-          testEvent = new BeforeTestEvent(executionConsole);
+          testEventProcessor = new BeforeTestEventProcessor(executionConsole);
           break;
         case ON_OUTPUT:
-          testEvent = new OnOutputEvent(executionConsole);
+          testEventProcessor = new OnOutputEventProcessor(executionConsole);
           break;
         case AFTER_TEST:
-          testEvent = new AfterTestEvent(executionConsole);
+          testEventProcessor = new AfterTestEventProcessor(executionConsole);
           break;
         case BEFORE_SUITE:
-          testEvent = new BeforeSuiteEvent(executionConsole);
+          testEventProcessor = new BeforeSuiteEventProcessor(executionConsole);
           break;
         case AFTER_SUITE:
-          testEvent = new AfterSuiteEvent(executionConsole);
+          testEventProcessor = new AfterSuiteEventProcessor(executionConsole);
           break;
         case UNKNOWN_EVENT:
           break;
       }
-      if (testEvent != null) {
-        testEvent.process(xml);
+      if (testEventProcessor != null) {
+        testEventProcessor.process(xml);
       }
     }
     catch (TestEventXmlView.XmlParserException e) {
diff --git a/plugins/gradle/java/src/execution/test/runner/events/AbstractTestEvent.java b/plugins/gradle/java/src/execution/test/runner/events/AbstractTestEventProcessor.java
similarity index 95%
rename from plugins/gradle/java/src/execution/test/runner/events/AbstractTestEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/AbstractTestEventProcessor.java
index 56cc58277f15..b1c0ef85b16e 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/AbstractTestEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/AbstractTestEventProcessor.java
@@ -19,10 +19,11 @@ import static org.jetbrains.plugins.gradle.execution.test.runner.GradleTestLocat
 /**
  * @author Vladislav.Soroka
  */
-public abstract class AbstractTestEvent implements TestEvent {
+public abstract class AbstractTestEventProcessor implements TestEventProcessor {
+
   private final GradleTestsExecutionConsole myExecutionConsole;
 
-  public AbstractTestEvent(GradleTestsExecutionConsole executionConsole) {
+  public AbstractTestEventProcessor(GradleTestsExecutionConsole executionConsole) {
     this.myExecutionConsole = executionConsole;
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/AfterSuiteEvent.java b/plugins/gradle/java/src/execution/test/runner/events/AfterSuiteEventProcessor.java
similarity index 95%
rename from plugins/gradle/java/src/execution/test/runner/events/AfterSuiteEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/AfterSuiteEventProcessor.java
index 4daedc71b0c1..18b3be4db260 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/AfterSuiteEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/AfterSuiteEventProcessor.java
@@ -28,8 +28,9 @@ import org.jetbrains.plugins.gradle.execution.test.runner.GradleTestsExecutionCo
 /**
  * @author Vladislav.Soroka
  */
-public class AfterSuiteEvent extends AbstractTestEvent {
-  public AfterSuiteEvent(GradleTestsExecutionConsole executionConsole) {
+public class AfterSuiteEventProcessor extends AbstractTestEventProcessor {
+
+  public AfterSuiteEventProcessor(GradleTestsExecutionConsole executionConsole) {
     super(executionConsole);
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/AfterTestEvent.java b/plugins/gradle/java/src/execution/test/runner/events/AfterTestEventProcessor.java
similarity index 97%
rename from plugins/gradle/java/src/execution/test/runner/events/AfterTestEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/AfterTestEventProcessor.java
index 329e3a69824e..11e503dc3be3 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/AfterTestEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/AfterTestEventProcessor.java
@@ -30,8 +30,9 @@ import static org.jetbrains.plugins.gradle.execution.GradleRunnerUtil.parseCompa
 /**
  * @author Vladislav.Soroka
  */
-public class AfterTestEvent extends AbstractTestEvent {
-  public AfterTestEvent(GradleTestsExecutionConsole executionConsole) {
+public class AfterTestEventProcessor extends AbstractTestEventProcessor {
+
+  public AfterTestEventProcessor(GradleTestsExecutionConsole executionConsole) {
     super(executionConsole);
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/BeforeSuiteEvent.java b/plugins/gradle/java/src/execution/test/runner/events/BeforeSuiteEventProcessor.java
similarity index 95%
rename from plugins/gradle/java/src/execution/test/runner/events/BeforeSuiteEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/BeforeSuiteEventProcessor.java
index 87a1f37ef61e..2ec784c67942 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/BeforeSuiteEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/BeforeSuiteEventProcessor.java
@@ -17,8 +17,8 @@ import java.util.Objects;
 /**
  * @author Vladislav.Soroka
  */
-public class BeforeSuiteEvent extends AbstractTestEvent {
-  public BeforeSuiteEvent(GradleTestsExecutionConsole executionConsole) {
+public class BeforeSuiteEventProcessor extends AbstractTestEventProcessor {
+  public BeforeSuiteEventProcessor(GradleTestsExecutionConsole executionConsole) {
     super(executionConsole);
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/BeforeTestEvent.java b/plugins/gradle/java/src/execution/test/runner/events/BeforeTestEventProcessor.java
similarity index 95%
rename from plugins/gradle/java/src/execution/test/runner/events/BeforeTestEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/BeforeTestEventProcessor.java
index 6557ba8218c9..071481a27c3c 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/BeforeTestEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/BeforeTestEventProcessor.java
@@ -16,9 +16,9 @@ import java.util.List;
 /**
  * @author Vladislav.Soroka
  */
-public class BeforeTestEvent extends AbstractTestEvent {
+public class BeforeTestEventProcessor extends AbstractTestEventProcessor {
 
-  public BeforeTestEvent(GradleTestsExecutionConsole executionConsole) {
+  public BeforeTestEventProcessor(GradleTestsExecutionConsole executionConsole) {
     super(executionConsole);
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/ConfigurationErrorEvent.java b/plugins/gradle/java/src/execution/test/runner/events/ConfigurationErrorEventProcessor.java
similarity index 95%
rename from plugins/gradle/java/src/execution/test/runner/events/ConfigurationErrorEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/ConfigurationErrorEventProcessor.java
index 00dc328432bc..d21c65131a33 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/ConfigurationErrorEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/ConfigurationErrorEventProcessor.java
@@ -29,9 +29,9 @@ import javax.swing.event.HyperlinkEvent;
 /**
  * @author Vladislav.Soroka
  */
-public class ConfigurationErrorEvent extends AbstractTestEvent {
+public class ConfigurationErrorEventProcessor extends AbstractTestEventProcessor {
 
-  public ConfigurationErrorEvent(GradleTestsExecutionConsole executionConsole) {
+  public ConfigurationErrorEventProcessor(GradleTestsExecutionConsole executionConsole) {
     super(executionConsole);
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/OnOutputEvent.java b/plugins/gradle/java/src/execution/test/runner/events/OnOutputEventProcessor.java
similarity index 94%
rename from plugins/gradle/java/src/execution/test/runner/events/OnOutputEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/OnOutputEventProcessor.java
index b4c9d4e8ca1b..a4c0a0c2b24a 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/OnOutputEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/OnOutputEventProcessor.java
@@ -14,12 +14,12 @@ import org.jetbrains.plugins.gradle.execution.test.runner.GradleTestsExecutionCo
 /**
  * @author Vladislav.Soroka
  */
-public class OnOutputEvent extends AbstractTestEvent {
+public class OnOutputEventProcessor extends AbstractTestEventProcessor {
 
   private static final String OUT = "StdOut";
   private static final String ERR = "StdErr";
 
-  public OnOutputEvent(GradleTestsExecutionConsole executionConsole) {
+  public OnOutputEventProcessor(GradleTestsExecutionConsole executionConsole) {
     super(executionConsole);
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/ReportLocationEvent.java b/plugins/gradle/java/src/execution/test/runner/events/ReportLocationEventProcessor.java
similarity index 90%
rename from plugins/gradle/java/src/execution/test/runner/events/ReportLocationEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/ReportLocationEventProcessor.java
index 2ae75fa8668c..e1c292630a79 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/ReportLocationEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/ReportLocationEventProcessor.java
@@ -25,9 +25,9 @@ import java.io.File;
 /**
  * @author Vladislav.Soroka
  */
-public class ReportLocationEvent extends AbstractTestEvent {
+public class ReportLocationEventProcessor extends AbstractTestEventProcessor {
 
-  public ReportLocationEvent(GradleTestsExecutionConsole consoleManager) {
+  public ReportLocationEventProcessor(GradleTestsExecutionConsole consoleManager) {
     super(consoleManager);
   }
 
diff --git a/plugins/gradle/java/src/execution/test/runner/events/TestEvent.java b/plugins/gradle/java/src/execution/test/runner/events/TestEventProcessor.java
similarity index 96%
rename from plugins/gradle/java/src/execution/test/runner/events/TestEvent.java
rename to plugins/gradle/java/src/execution/test/runner/events/TestEventProcessor.java
index 28e8a57916a8..0589023375a8 100644
--- a/plugins/gradle/java/src/execution/test/runner/events/TestEvent.java
+++ b/plugins/gradle/java/src/execution/test/runner/events/TestEventProcessor.java
@@ -22,7 +22,8 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author Vladislav.Soroka
  */
-public interface TestEvent {
+public interface TestEventProcessor {
+
   void process(@NotNull final TestEventXmlView eventXml) throws TestEventXmlView.XmlParserException;
 
   void process(@NotNull final ExternalSystemProgressEvent<? extends TestOperationDescriptor> testEvent);