diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy
index 5178ef4..e54b149 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraph.groovy
@@ -119,7 +119,7 @@ abstract class CoreGraph implements GremlinTrait {
 	//Graph graph
 
 	/** */
-	CoreGraphSchema graphSchema
+	DefaultGraphSchema graphSchema
 
 	/** */
 	GraphValidator graphValidator
@@ -131,7 +131,7 @@ abstract class CoreGraph implements GremlinTrait {
 	///////////////////////////////////////////////////////////////////////////
 
 	/** */
-	protected CoreGraph(Graph graph, CoreGraphSchema graphSchema, GraphValidator graphValidator) {
+	protected CoreGraph(Graph graph, DefaultGraphSchema graphSchema, GraphValidator graphValidator) {
 		assert graph
 		assert graphSchema
 		assert graphValidator
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy
index 1e3d8cf..0413ae6 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphNeo4j.groovy
@@ -54,10 +54,10 @@ class CoreGraphNeo4j extends CoreGraph {
     	def graph = openGremlinGraph()
 
 		def graphSchema
-        if (args.vertexBuilders) graphSchema = new CoreGraphSchema(args.vertexBuilders)
-        else graphSchema = new CoreGraphSchema()
+        if (args.vertexBuilders) graphSchema = new DefaultGraphSchema(args.vertexBuilders)
+        else graphSchema = new DefaultGraphSchema()
 
-        def graphValidator = new GremlinGraphValidator()
+        def graphValidator = new DefaultGraphValidator()
         def coreGraph = new CoreGraphNeo4j(graph, graphSchema, graphValidator)
 
     	def g = graph.traversal()
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy
index a41c386..d50557c 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphSchema.groovy
@@ -35,17 +35,17 @@ import carnival.graph.VertexBuilder
  *
  */
 @Slf4j
-class CoreGraphSchema implements GraphSchema {
+class DefaultGraphSchema implements GraphSchema {
 
 	///////////////////////////////////////////////////////////////////////////
 	// CONSTRUCTOR
 	///////////////////////////////////////////////////////////////////////////
 
 	/** */
-	public CoreGraphSchema() { }
+	public DefaultGraphSchema() { }
 
 	/** */
-	public CoreGraphSchema(Collection<VertexBuilder> vertexBuilders) {
+	public DefaultGraphSchema(Collection<VertexBuilder> vertexBuilders) {
 		assert vertexBuilders
 		assert vertexBuilders.size() > 0
 		this.vertexBuilders.addAll(vertexBuilders)
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy
index ad951ed..269cd7d 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphTinker.groovy
@@ -45,10 +45,10 @@ class CoreGraphTinker extends CoreGraph {
     	def graph = TinkerGraph.open()
 
 		def graphSchema
-        if (args.vertexBuilders) graphSchema = new CoreGraphSchema(args.vertexBuilders)
-        else graphSchema = new CoreGraphSchema()
+        if (args.vertexBuilders) graphSchema = new DefaultGraphSchema(args.vertexBuilders)
+        else graphSchema = new DefaultGraphSchema()
 
-        def graphValidator = new GremlinGraphValidator()
+        def graphValidator = new DefaultGraphValidator()
         def coreGraph = new CoreGraphTinker(graph, graphSchema, graphValidator)
 
     	def g = graph.traversal()
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphValidator.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphValidator.groovy
index 6b690db..0f7c069 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphValidator.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/CoreGraphValidator.groovy
@@ -18,7 +18,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__
 
 /** */
 @Slf4j
-public class LegacyValidator extends GremlinGraphValidator {
+public class LegacyValidator extends DefaultGraphValidator {
 
 	///////////////////////////////////////////////////////////////////////////
 	// MODEL CHECKING
diff --git a/app/carnival-core/src/main/groovy/carnival/core/graph/GremlinGraphValidator.groovy b/app/carnival-core/src/main/groovy/carnival/core/graph/GremlinGraphValidator.groovy
index e45c9cd..1b99e74 100644
--- a/app/carnival-core/src/main/groovy/carnival/core/graph/GremlinGraphValidator.groovy
+++ b/app/carnival-core/src/main/groovy/carnival/core/graph/GremlinGraphValidator.groovy
@@ -22,7 +22,7 @@ import carnival.graph.Base
 
 /** */
 @Slf4j
-public class GremlinGraphValidator implements GraphValidator {
+public class DefaultGraphValidator implements GraphValidator {
 
 	///////////////////////////////////////////////////////////////////////////
 	// STATIC METOHDS
diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphInitSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphInitSpec.groovy
index 50e3096..583320c 100644
--- a/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphInitSpec.groovy
+++ b/app/carnival-core/src/test/groovy/carnival/core/graph/CoreGraphInitSpec.groovy
@@ -66,8 +66,8 @@ class CoreGraphInitSpec extends Specification {
         graph != null
 
         when:
-        def graphSchema = new CoreGraphSchema()
-        def graphValidator = new GremlinGraphValidator()
+        def graphSchema = new DefaultGraphSchema()
+        def graphValidator = new DefaultGraphValidator()
         def coreGraph = new CoreGraphNeo4j(graph, graphSchema, graphValidator)
 
         then:
diff --git a/app/carnival-core/src/test/groovy/carnival/core/graph/GremlinGraphValidatorSpec.groovy b/app/carnival-core/src/test/groovy/carnival/core/graph/GremlinGraphValidatorSpec.groovy
index b412500..bcb795c 100644
--- a/app/carnival-core/src/test/groovy/carnival/core/graph/GremlinGraphValidatorSpec.groovy
+++ b/app/carnival-core/src/test/groovy/carnival/core/graph/GremlinGraphValidatorSpec.groovy
@@ -17,10 +17,10 @@ import test.TestModel
 
 
 /**
- * gradle test --tests "carnival.core.graph.GremlinGraphValidatorSpec"
+ * gradle test --tests "carnival.core.graph.DefaultGraphValidatorSpec"
  *
  */
-class GremlinGraphValidatorSpec extends Specification {
+class DefaultGraphValidatorSpec extends Specification {
 
     static enum VX1 implements VertexDefinition {
         GGV_THING,
@@ -96,7 +96,7 @@ class GremlinGraphValidatorSpec extends Specification {
         coreGraph = CoreGraphTinker.create()
         graph = coreGraph.graph
         graphSchema = coreGraph.graphSchema
-        graphValidator = new GremlinGraphValidator()
+        graphValidator = new DefaultGraphValidator()
         g = graph.traversal()
     }
 
@@ -185,7 +185,7 @@ class GremlinGraphValidatorSpec extends Specification {
         graphValidator.checkConstraints(g, graphSchema).size() == 0
 
         when:
-        Core.VX.APPLICATION.instance().withProperty(Core.PX.NAME, 'GremlinGraphValidatorSpecApp').vertex(graph, g)
+        Core.VX.APPLICATION.instance().withProperty(Core.PX.NAME, 'DefaultGraphValidatorSpecApp').vertex(graph, g)
 
         then:
         graphValidator.checkModel(g, graphSchema).size() == 0