How confident are we about spaces in file names? I'd be tempted to just use underscores here.