Moving name manipulation into utils