Change userName to username