Actually use the new query system and rename a method