Fix filename containing white-space from templates...