working on fixing change name problems