Better file naming consistency

7 jobs for main in 2 minutes and 11 seconds
latest