diff --git a/src/main/java/org/gcube/common/storagehub/model/Metadata.java b/src/main/java/org/gcube/common/storagehub/model/Metadata.java
index a011186..8107554 100644
--- a/src/main/java/org/gcube/common/storagehub/model/Metadata.java
+++ b/src/main/java/org/gcube/common/storagehub/model/Metadata.java
@@ -17,5 +17,5 @@ import lombok.Setter;
 public class Metadata {
 
 	@MapAttribute(excludeStartWith="jcr:")
-	Map<String, Object> values = new HashMap<String, Object>();
+	Map<String, Object> map = new HashMap<String, Object>();
 }
diff --git a/src/main/java/org/gcube/common/storagehub/model/items/Item.java b/src/main/java/org/gcube/common/storagehub/model/items/Item.java
index 72eeca4..dc6c7d3 100644
--- a/src/main/java/org/gcube/common/storagehub/model/items/Item.java
+++ b/src/main/java/org/gcube/common/storagehub/model/items/Item.java
@@ -72,7 +72,7 @@ public class Item {
 	Accounting accounting;
 
 	@NodeAttribute(value=METADATA_NAME)
-	Metadata propertyMap = new Metadata();
+	Metadata metadata = new Metadata();
 		
 	public String getOwner() {
 		if (owner!=null) return owner;