Remove hard-coded suite names

3 jobs for master