refactor query file names