Changed filenames to be more general.