4 files changed, 4 insertions, 4 deletions
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
index a5d3a349a..74f092a94 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEventModel.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventModelTest.java
@@ -37,7 +37,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxEvents;
  * Test event models.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestEventModel {
+public class EventModelTest {
 
     @Test
     public void testEventModel() {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
index 36ef6ade5..4a17c2a48 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestEvents.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/EventsTest.java
@@ -43,7 +43,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxField;
  * Test events.
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestEvents {
+public class EventsTest {
 
     @Test
     public void testEvents() {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
index 75fced1b0..3d88b4c81 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/TestField.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/concepts/FieldTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.apex.model.eventmodel.concepts.AxOutputField;
  * 
  * @author Liam Fallon (liam.fallon@ericsson.com)
  */
-public class TestField {
+public class FieldTest {
 
     @Test
     public void testField() {
diff --git a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
index 643bdfaa2..aaed3cd7f 100644
--- a/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/TestApexEventModel.java
+++ b/model/event-model/src/test/java/org/onap/policy/apex/model/eventmodel/handling/ApexEventModelTest.java
@@ -34,7 +34,7 @@ import org.onap.policy.apex.model.basicmodel.dao.DaoParameters;
 import org.onap.policy.apex.model.basicmodel.test.TestApexModel;
 import org.onap.policy.apex.model.eventmodel.concepts.AxEventModel;
 
-public class TestApexEventModel {
+public class ApexEventModelTest {
     private Connection connection;
     TestApexModel<AxEventModel> testApexModel;