Adding support for renaming accounts