Updated query names