Rename our test suites so the names make sense #5940

#5940