refactor to new naming convention

2 jobs for feature/toastTest in 12 minutes and 38 seconds (queued for 1 second)