Rename some functions
Remember the query