Rename EntityMapper to EntityHydrator & RestEntityMapper to EntityMapper