Fixed bug in name change