Make filenames more consistent