diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
index 345d264..3f31595 100644
--- a/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
+++ b/src/main/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientImpl.java
@@ -16,7 +16,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.schema.Schema
 import org.gcube.informationsystem.resourceregistry.api.rest.TypePath;
 import org.gcube.informationsystem.resourceregistry.api.rest.httputils.HTTPUtility;
 import org.gcube.informationsystem.resourceregistry.api.utils.Utility;
-import org.gcube.informationsystem.types.TypeBinder;
+import org.gcube.informationsystem.types.TypeMapper;
 import org.gcube.informationsystem.types.reference.Type;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,10 +39,10 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
 	public <E extends Element> Type create(Class<E> clz)
 			throws SchemaException, ResourceRegistryException {
 		try {
-			String typeDefinition = TypeBinder.serializeType(clz);
+			String typeDefinition = TypeMapper.serializeType(clz);
 			// String type = AccessType.getAccessType(clz).getName();
 			String res = create(typeDefinition);
-			return TypeBinder.deserializeTypeDefinition(res);
+			return TypeMapper.deserializeTypeDefinition(res);
 		} catch(ResourceRegistryException e) {
 			throw e;
 		} catch(Exception e) {
@@ -54,7 +54,7 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
 	public String create(String typeDefinitition) throws ContextAlreadyPresentException, ResourceRegistryException {
 		try {
 			logger.trace("Going to create: {}", typeDefinitition);
-			Type typeDefinitionObj = TypeBinder.deserializeTypeDefinition(typeDefinitition);
+			Type typeDefinitionObj = TypeMapper.deserializeTypeDefinition(typeDefinitition);
 			
 			GXHTTPStringRequest gxHTTPStringRequest = GXHTTPStringRequest.newRequest(address);
 			gxHTTPStringRequest.from(ResourceRegistrySchemaClient.class.getSimpleName());
@@ -83,7 +83,7 @@ public class ResourceRegistrySchemaClientImpl implements ResourceRegistrySchemaC
 		try {
 			String typeName = Utility.getTypeName(clz);
 			String res = read(typeName, polymorphic);
-			return TypeBinder.deserializeTypeDefinitions(res);
+			return TypeMapper.deserializeTypeDefinitions(res);
 		} catch(ResourceRegistryException e) {
 			throw e;
 		} catch(Exception e) {
diff --git a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
index 8615262..b6e8715 100644
--- a/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
+++ b/src/test/java/org/gcube/informationsystem/resourceregistry/schema/ResourceRegistrySchemaClientTest.java
@@ -3,7 +3,7 @@ package org.gcube.informationsystem.resourceregistry.schema;
 import java.util.List;
 
 import org.gcube.informationsystem.model.reference.entities.Facet;
-import org.gcube.informationsystem.types.TypeBinder;
+import org.gcube.informationsystem.types.TypeMapper;
 import org.gcube.informationsystem.types.annotations.Abstract;
 import org.gcube.informationsystem.types.reference.Type;
 import org.junit.Assert;
@@ -41,7 +41,7 @@ public class ResourceRegistrySchemaClientTest extends ContextTest {
 		types = resourceRegistrySchemaClient.read(Facet.class, false);
 		Assert.assertTrue(types.size()==1);
 		Type gotFacetDefinition = types.get(0);
-		Type facetDefinition = TypeBinder.createTypeDefinition(Facet.class);
+		Type facetDefinition = TypeMapper.createTypeDefinition(Facet.class);
 		
 		
 		Assert.assertTrue(gotFacetDefinition.getName().compareTo(facetDefinition.getName())==0);