Fixing name -> nick mapping.