5 files changed, 5 insertions, 5 deletions
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextAlbums.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
index 6ba0b2fa6..eb0db0da7 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextAlbums.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextAlbumsTest.java
@@ -39,7 +39,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextAlbums;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestContextAlbums {
+public class ContextAlbumsTest {
 
     @Test
     public void testContextAlbums() {
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextModel.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
index 290183e5f..fbf97881f 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextModel.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextModelTest.java
@@ -38,7 +38,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestContextModel {
+public class ContextModelTest {
 
     @Test
     public void test() {
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextSchemas.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
index a8dde7781..73f4c3086 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/TestContextSchemas.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/concepts/ContextSchemasTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextSchemas;
 /**
  * Context schema tests.
  */
-public class TestContextSchemas {
+public class ContextSchemasTest {
 
     @Test
     public void testContextSchemas() {
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModel.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java
index 94a36844f..948c2024c 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestApexContextModel.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ApexContextModelTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.contextmodel.concepts.AxContextModel;
  * @author liam
  *
  */
-public class TestApexContextModel {
+public class ApexContextModelTest {
     private Connection connection;
     TestApexModel<AxContextModel> testApexModel;
 
diff --git a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparison.java b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
index 65295c13b..81609cacf 100644
--- a/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/TestContextComparison.java
+++ b/model/context-model/src/test/java/org/onap/policy/apex/model/contextmodel/handling/ContextComparisonTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.utilities.comparison.KeyedMapDifference;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestContextComparison {
+public class ContextComparisonTest {
     private AxContextModel emptyModel;
     private AxContextModel fullModel;
     private AxContextModel noGlobalContextModel;