Name/nickname fixes