diff --git a/src/main/java/org/gcube/informationsystem/model/reference/properties/Encrypted.java b/src/main/java/org/gcube/informationsystem/model/reference/properties/Encrypted.java
index 906da64..c711d44 100644
--- a/src/main/java/org/gcube/informationsystem/model/reference/properties/Encrypted.java
+++ b/src/main/java/org/gcube/informationsystem/model/reference/properties/Encrypted.java
@@ -13,10 +13,11 @@ import org.gcube.informationsystem.utils.TypeVersion;
  * @author Luca Frosini (ISTI - CNR)
  */
 @JsonDeserialize(as=EncryptedImpl.class)
-@TypeMetadata(name = "Encrypted", description = "This is the base class for Encrypted values", version = TypeVersion.MINIMAL_VERSION_STRING)
+@TypeMetadata(name = Encrypted.NAME, description = "This is the base class for Encrypted values", version = TypeVersion.MINIMAL_VERSION_STRING)
 @Change(version = TypeVersion.MINIMAL_VERSION_STRING, description = TypeVersion.MINIMAL_VERSION_DESCRIPTION)
 public interface Encrypted extends Property {
 	
+	public static final String NAME = "Encrypted"; // Encrypted.class.getSimpleName();
 	public static final String VALUE = "value";
 	
 	@ISProperty(name=VALUE, readonly=false, mandatory=true, nullable=false)
diff --git a/src/main/java/org/gcube/informationsystem/types/reference/entities/ResourceType.java b/src/main/java/org/gcube/informationsystem/types/reference/entities/ResourceType.java
index 7bebb6f..950f5f0 100644
--- a/src/main/java/org/gcube/informationsystem/types/reference/entities/ResourceType.java
+++ b/src/main/java/org/gcube/informationsystem/types/reference/entities/ResourceType.java
@@ -16,8 +16,6 @@ import org.gcube.informationsystem.utils.TypeVersion;
 public interface ResourceType extends EntityType {
 	
 	public static final String NAME = "ResourceType"; //ResourceType.class.getSimpleName();
-	public static final String DESCRIPTION = "Used to define a Resource Type";
-	public static final String VERSION = "1.0.0";
 	
 	public static final String FACETS_PROPERTY = "facets";
 	public static final String RESOURCES_PROPERTY = "resources";