Rename query class