standardize on '-' rather than '_' in filenames
standardize on '-' rather than '_' in test filenames too