remap entities, common code was moved to base entity