For the variablisation of the filename, that would be another ticket, as it is an unrelated change :)