Global suppressions, suppression options names refactored