revise query naming