diff --git a/src/main/java/org/gcube/informationsystem/model/reference/ModelElement.java b/src/main/java/org/gcube/informationsystem/model/reference/ERElement.java
similarity index 83%
rename from src/main/java/org/gcube/informationsystem/model/reference/ModelElement.java
rename to src/main/java/org/gcube/informationsystem/model/reference/ERElement.java
index 9f34688..abcdd96 100644
--- a/src/main/java/org/gcube/informationsystem/model/reference/ModelElement.java
+++ b/src/main/java/org/gcube/informationsystem/model/reference/ERElement.java
@@ -8,6 +8,6 @@ import org.gcube.informationsystem.base.reference.IdentifiableElement;
  * 
  * @author Luca Frosini (ISTI - CNR)
  */
-public interface ModelElement extends IdentifiableElement {
+public interface ERElement extends IdentifiableElement {
 
 }
diff --git a/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java b/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java
index ab4e447..c1a614e 100644
--- a/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java
+++ b/src/main/java/org/gcube/informationsystem/model/reference/entities/Entity.java
@@ -4,7 +4,7 @@
 package org.gcube.informationsystem.model.reference.entities;
 
 import org.gcube.informationsystem.base.reference.entities.EntityElement;
-import org.gcube.informationsystem.model.reference.ModelElement;
+import org.gcube.informationsystem.model.reference.ERElement;
 import org.gcube.informationsystem.types.annotations.Abstract;
 import org.gcube.informationsystem.types.reference.Change;
 import org.gcube.informationsystem.types.reference.TypeMetadata;
@@ -19,7 +19,7 @@ import org.gcube.informationsystem.utils.TypeVersion;
 //@JsonDeserialize(as=EntityImpl.class) Do not uncomment to manage subclasses
 @TypeMetadata(name = Entity.NAME, description = "This is the base class for Entities", version = TypeVersion.MINIMAL_VERSION_STRING)
 @Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION)
-public interface Entity extends EntityElement, ModelElement {
+public interface Entity extends EntityElement, ERElement {
 	
 	public static final String NAME = "Entity"; //Entity.class.getSimpleName();
 	
diff --git a/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java b/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java
index 58b37e5..7d88706 100644
--- a/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java
+++ b/src/main/java/org/gcube/informationsystem/model/reference/relations/Relation.java
@@ -13,7 +13,7 @@ import org.gcube.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.gcube.com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.gcube.informationsystem.base.reference.SchemaMixedElement;
 import org.gcube.informationsystem.base.reference.relations.RelationElement;
-import org.gcube.informationsystem.model.reference.ModelElement;
+import org.gcube.informationsystem.model.reference.ERElement;
 import org.gcube.informationsystem.model.reference.entities.Entity;
 import org.gcube.informationsystem.model.reference.entities.Resource;
 import org.gcube.informationsystem.model.reference.properties.PropagationConstraint;
@@ -33,7 +33,7 @@ import org.gcube.informationsystem.utils.TypeVersion;
 // @JsonDeserialize(as=RelationImpl.class) Do not uncomment to manage subclasses
 @TypeMetadata(name = Relation.NAME, description = "This is the base class for Relations", version = TypeVersion.MINIMAL_VERSION_STRING)
 @Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION)
-public interface Relation<S extends Resource, T extends Entity> extends RelationElement<S,T>, SchemaMixedElement, ModelElement {
+public interface Relation<S extends Resource, T extends Entity> extends RelationElement<S,T>, SchemaMixedElement, ERElement {
 	
 	public static final String NAME = "Relation"; //Relation.class.getSimpleName();