6 files changed, 11 insertions, 11 deletions
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdateTest.java
index 54440370c..218a8f9af 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextAlbumUpdate.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextAlbumUpdateTest.java
@@ -35,9 +35,9 @@ import org.onap.policy.common.parameters.ParameterService;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 
-public class TestContextAlbumUpdate {
+public class ContextAlbumUpdateTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextAlbumUpdate.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ContextAlbumUpdateTest.class);
 
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextInstantiationTest.java
index ba402da24..d635be441 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextInstantiation.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextInstantiationTest.java
@@ -40,9 +40,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestContextInstantiation {
+public class ContextInstantiationTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextInstantiation.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ContextInstantiationTest.class);
 
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextUpdateTest.java
index 8ef8bf005..0eaf591e3 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestContextUpdate.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/ContextUpdateTest.java
@@ -41,9 +41,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestContextUpdate {
+public class ContextUpdateTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestContextUpdate.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ContextUpdateTest.class);
     
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiationTest.java
index d1cdc6d97..21ab6ef9e 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/TestSequentialContextInstantiation.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/distribution/SequentialContextInstantiationTest.java
@@ -40,9 +40,9 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestSequentialContextInstantiation {
+public class SequentialContextInstantiationTest {
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestSequentialContextInstantiation.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(SequentialContextInstantiationTest.class);
 
     private SchemaParameters schemaParameters;
     private ContextParameters contextParameters;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/ConcurrentContextTest.java
index ed9aff0c1..7274f0d57 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/TestConcurrentContext.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/locking/ConcurrentContextTest.java
@@ -50,10 +50,10 @@ import org.slf4j.ext.XLoggerFactory;
  *
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestConcurrentContext {
+public class ConcurrentContextTest {
 
     // Logger for this class
-    private static final XLogger logger = XLoggerFactory.getXLogger(TestConcurrentContext.class);
+    private static final XLogger logger = XLoggerFactory.getXLogger(ConcurrentContextTest.class);
 
     // Test parameters
     private static final int ALBUM_SIZE = 16;
diff --git a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/PersistentContextInstantiationTest.java
index a659326a0..6bd4a4d41 100644
--- a/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/TestPersistentContextInstantiation.java
+++ b/context/context-test-utils/src/test/java/org/onap/policy/apex/context/test/persistence/PersistentContextInstantiationTest.java
@@ -62,7 +62,7 @@ import org.onap.policy.common.parameters.ParameterService;
  *
  * @author Sergey Sachkov (sergey.sachkov@ericsson.com)
  */
-public class TestPersistentContextInstantiation {
+public class PersistentContextInstantiationTest {
     // Logger for this class
     // private static final XLogger logger =
     // XLoggerFactory.getXLogger(TestPersistentContextInstantiation.class);