Fix up analysis to work with slightly changed file name format.