Standardize hyphen-vs-underscore in a few filenames