4 files changed, 9 insertions, 9 deletions
diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CliCodegenTest.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java
index 5433f2d15..e1bf3b298 100644
--- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CliCodegenTest.java
+++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/CodeGeneratorCliEditorTest.java
@@ -59,9 +59,9 @@ import org.stringtemplate.v4.ST;
 /**
  * Test CLI code generation.
  */
-public class CliCodegenTest {
+public class CodeGeneratorCliEditorTest {
 
-    private KeyInfoGetter kig;
+    private SupportKeyInfoGetter kig;
     private File outFile = null;
 
     @Test
@@ -96,7 +96,7 @@ public class CliCodegenTest {
      * @throws IOException  on generation exceptions
      */
     private int generateCli(final CodeGeneratorCliEditor codeGen, final AxPolicyModel policyModel) throws IOException {
-        kig = new KeyInfoGetter(policyModel);
+        kig = new SupportKeyInfoGetter(policyModel);
 
         // Order is important. 0: model, 1: context schemas, 2: tasks, 3: events, 4: ContextAlbums, 5: Policies
         // 0: model
diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/StErrorListener.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/DummyStErrorListener.java
index 28e32bca6..33387accc 100644
--- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/StErrorListener.java
+++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/DummyStErrorListener.java
@@ -28,7 +28,7 @@ import org.stringtemplate.v4.misc.STMessage;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class StErrorListener implements STErrorListener {
+public class DummyStErrorListener implements STErrorListener {
 
     /** Counts errors of the listener. */
     private int errorCount;
diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/GenerationTest.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/SupportGenerationTester.java
index 3b79e805c..9d91f8f68 100644
--- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/GenerationTest.java
+++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/SupportGenerationTester.java
@@ -39,7 +39,7 @@ import org.stringtemplate.v4.STGroupFile;
  *
  * @author Sven van der Meer (sven.van.der.meer@ericsson.com)
  */
-public class GenerationTest {
+public class SupportGenerationTester {
 
     /**
      * Get the chunks for the codegen.
@@ -90,7 +90,7 @@ public class GenerationTest {
     /** Test STG load. */
     @Test
     public void testGenerationLoad() {
-        final StErrorListener errListener = new StErrorListener();
+        final DummyStErrorListener errListener = new DummyStErrorListener();
         final STGroupFile stg = new STGroupFile(CodeGeneratorCliEditor.STG_FILE);
         stg.setListener(errListener);
 
@@ -101,7 +101,7 @@ public class GenerationTest {
     /** Test STG chunks. */
     @Test
     public void testGenerationChunks() {
-        final StErrorListener errListener = new StErrorListener();
+        final DummyStErrorListener errListener = new DummyStErrorListener();
         final STGroupFile stg = new STGroupFile(CodeGeneratorCliEditor.STG_FILE);
         stg.setListener(errListener);
 
diff --git a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/KeyInfoGetter.java b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/SupportKeyInfoGetter.java
index 97d05679c..5547aa4f7 100644
--- a/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/KeyInfoGetter.java
+++ b/auth/cli-codegen/src/test/java/org/onap/policy/apex/auth/clicodegen/SupportKeyInfoGetter.java
@@ -31,7 +31,7 @@ import org.onap.policy.apex.model.policymodel.concepts.AxPolicyModel;
  * @author John Keeney (john.keeney@ericsson.com)
  */
 
-public class KeyInfoGetter {
+public class SupportKeyInfoGetter {
 
     /** The policy model for the getters. */
     private final AxPolicyModel model;
@@ -41,7 +41,7 @@ public class KeyInfoGetter {
      *
      * @param model the policy model to use
      */
-    public KeyInfoGetter(final AxPolicyModel model) {
+    public SupportKeyInfoGetter(final AxPolicyModel model) {
         this.model = model;
     }