Rename query data structure to query-data and query string to query-str