Made analysis output filenames more useful.