added name and fixed mapping