Query output files should have the query name

Query output persisted files generated post execution should have the query name specified with the query. This will let users track the query outputs better.