Standardized the filenames so they are machine-predictable