Refactor query reviver function name