add better messaging, and optimize name changing more efficiently