More test suite nomenclature standardization.