Rename query option methods