6 files changed, 9 insertions, 9 deletions
diff --git a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/TestMessageListener.java b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/SupportMessageListenerTester.java
index 8bb1c7e37..3ee6a4b51 100644
--- a/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/TestMessageListener.java
+++ b/core/core-deployment/src/test/java/org/onap/policy/apex/core/deployment/SupportMessageListenerTester.java
@@ -29,7 +29,7 @@ import org.onap.policy.apex.core.protocols.Message;
 /**
  * A test message listener.
  */
-public class TestMessageListener implements MessageListener<Message> {
+public class SupportMessageListenerTester implements MessageListener<Message> {
     @Override
     public void onMessage(String messageString) {
         fail("Message should not be received");
diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java
index 2a80cf06b..6d35adc54 100644
--- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java
+++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/ApexEngineImplTest.java
@@ -371,7 +371,7 @@ public class ApexEngineImplTest {
         }
 
         try {
-            engine.addEventListener("badListener", new BadListener());
+            engine.addEventListener("badListener", new DummyEnEventListener());
         } catch (Exception e) {
             fail("test should not throw an exception");
         }
@@ -394,7 +394,7 @@ public class ApexEngineImplTest {
 
         try {
             engine.removeEventListener("badListener");
-            engine.addEventListener("slowListener", new SlowListener());
+            engine.addEventListener("slowListener", new DummySlowEnEventListener());
         } catch (Exception e) {
             fail("test should not throw an exception");
         }
@@ -414,7 +414,7 @@ public class ApexEngineImplTest {
             fail("test should not throw an exception");
         }
 
-        SlowListener slowListener = new SlowListener();
+        DummySlowEnEventListener slowListener = new DummySlowEnEventListener();
         try {
             engine.addEventListener("slowListener", slowListener);
         } catch (Exception e) {
diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/BadListener.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java
index b829437d6..e67d256fe 100644
--- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/BadListener.java
+++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummyEnEventListener.java
@@ -28,7 +28,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
  * Dummy engine event listener for unit test.
  *
  */
-public class BadListener implements EnEventListener {
+public class DummyEnEventListener implements EnEventListener {
 
     /*
      * (non-Javadoc)
diff --git a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/SlowListener.java b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java
index f3f885911..fbb38c99e 100644
--- a/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/SlowListener.java
+++ b/core/core-engine/src/test/java/org/onap/policy/apex/core/engine/engine/impl/DummySlowEnEventListener.java
@@ -28,7 +28,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
  * Dummy engine event listener for unit test.
  *
  */
-public class SlowListener implements EnEventListener {
+public class DummySlowEnEventListener implements EnEventListener {
 
     private long waitTime;
 
diff --git a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/TestMessageListener.java b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
index 9e7562b5e..4d5aedb3d 100644
--- a/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/TestMessageListener.java
+++ b/core/core-infrastructure/src/test/java/org/onap/policy/apex/core/infrastructure/messaging/DummyMessageListener.java
@@ -33,10 +33,10 @@ import org.slf4j.ext.XLoggerFactory;
  * method is invoked.
  *
  */
-public abstract class TestMessageListener implements MessageListener<String> {
+public abstract class DummyMessageListener implements MessageListener<String> {
 
     /** The Constant logger. */
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestMessageListener.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(DummyMessageListener.class);
 
     /**
      * On command.
diff --git a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/MessageTest.java b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTester.java
index a9c86d618..233a1c2ac 100644
--- a/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/MessageTest.java
+++ b/core/core-protocols/src/test/java/org/onap/policy/apex/core/protocols/SupportMessageTester.java
@@ -32,7 +32,7 @@ import org.onap.policy.apex.model.basicmodel.concepts.AxArtifactKey;
 /**
  * Test of the abstract Message class.
  */
-public class MessageTest {
+public class SupportMessageTester {
 
     @SuppressWarnings("unlikely-arg-type")
     @Test