Next round of fixes.

MFC after:	3 days
Modify a few output file names as used with vt.

MFC after:	3 days