3 files changed, 8 insertions, 8 deletions
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmark.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmarkTest.java
index fa2a9934c..99035f7bf 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmark.java
+++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEngineBenchmarkTest.java
@@ -37,9 +37,9 @@ import org.slf4j.ext.XLoggerFactory;
 /**
  * The Class ApexEngineBenchmark.
  */
-public class ApexEngineBenchmark {
+public class ApexEngineBenchmarkTest {
     // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEngineBenchmark.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEngineBenchmarkTest.class);
 
     private static final String TARGET = "apex";
     private static final String SOURCE = "test";
@@ -132,7 +132,7 @@ public class ApexEngineBenchmark {
             throws Exception {
 
         LOGGER.info("Running Test with Event count: {}, Instance count: {} and loop: {}", eventsCount, threads, loop);
-        final TestApexEventListener apexEventListener = new TestApexEventListener();
+        final ApexEventListenerTest apexEventListener = new ApexEventListenerTest();
 
         final ApexBaseBenchMarkTest apexBaseBenchMarkTest =
                 new ApexBaseBenchMarkTest(policyModel, threads, apexEventListener);
diff --git a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/TestApexEventListener.java b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEventListenerTest.java
index 2b6c89de7..a5950df97 100644
--- a/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/TestApexEventListener.java
+++ b/testsuites/performance/performance-benchmark-test/src/test/java/org/onap/policy/apex/testsuites/performance/benchmark/engine/benchmark/ApexEventListenerTest.java
@@ -42,10 +42,10 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @see TestApexEventEvent
  */
-public class TestApexEventListener implements ApexEventListener {
+public class ApexEventListenerTest implements ApexEventListener {
 
     private static final String SENT_TIMESTAMP = "SentTimestamp";
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestApexEventListener.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(ApexEventListenerTest.class);
     private static final String RECVD_TIMESTAMP = "RecvdTimestamp";
     private Queue<ApexEvent> queue;
 
@@ -54,7 +54,7 @@ public class TestApexEventListener implements ApexEventListener {
     /**
      * Instantiates a new test apex event listener.
      */
-    public TestApexEventListener() {
+    public ApexEventListenerTest() {
         this.queue = new ConcurrentLinkedQueue<ApexEvent>();
     }
 
diff --git a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/TestMetrics.java b/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java
index 13610121a..af6b46918 100644
--- a/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/TestMetrics.java
+++ b/testsuites/performance/performance-context-metrics/src/test/java/org/onap/policy/apex/testsuites/performance/context/metrics/MetricsTest.java
@@ -40,9 +40,9 @@ import org.slf4j.ext.XLoggerFactory;
 /**
  * The Class TestMetrics.
  */
-public class TestMetrics {
+public class MetricsTest {
     // Logger for this class
-    private static final XLogger LOGGER = XLoggerFactory.getXLogger(TestMetrics.class);
+    private static final XLogger LOGGER = XLoggerFactory.getXLogger(MetricsTest.class);
     private static final String HAZELCAST_CONFIG = "hazelcast.config";
 
     private static final String JAVA_NET_PREFER_IPV4_STACK = "java.net.preferIPv4Stack";