Added ability to change name