Rename setGemfireInstantiators(:Map<Class<?>>, EntityInstantior>) to setEntityInstantiators(:Map<Class<?>, EntityInstantior>). Rename getGemfireInstantiators() to getEntityInstantiators(). Rename getCustomPdxSerializer(:PersistentProperty) to resolveCustomPdxSerializer(:PersistentProperty). Rename getInstantiatorFor(:PersistentEntity) to resolveEntityInstantiator(:PersistentEntity).