Update output file name formats.
Bunch of fixes to manual.