Fixes #81, Move generateFileName to Querypoint, rather than pass it around.