Better file naming consistency

7 jobs for main in 1 minute and 12 seconds
latest