Use account name in all places if possible