master: Quick fix to keep spaces out of the file names.