diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
index 8e4c7c1..cc47638 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientImpl.java
@@ -5,10 +5,10 @@ import java.util.List;
 import java.util.UUID;
 
 import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
-import org.gcube.informationsystem.model.impl.embedded.HeaderImpl;
+import org.gcube.informationsystem.model.impl.properties.HeaderImpl;
 import org.gcube.informationsystem.model.impl.utils.ISMapper;
-import org.gcube.informationsystem.model.reference.embedded.Header;
 import org.gcube.informationsystem.model.reference.entity.Context;
+import org.gcube.informationsystem.model.reference.properties.Header;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException;
 import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextNotFoundException;
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
index 6c76438..5470a35 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/context/ResourceRegistryContextClientTest.java
@@ -40,7 +40,7 @@ public class ResourceRegistryContextClientTest extends ScopedTest {
 	public static final String CTX_NAME_C = "C";
 	
 	public static String getUser() {
-		String user = org.gcube.informationsystem.model.reference.embedded.Header.UNKNOWN_USER;
+		String user = org.gcube.informationsystem.model.reference.properties.Header.UNKNOWN_USER;
 		try {
 			String token = SecurityTokenProvider.instance.get();
 			if(token != null) {