Uppercase abbreviations to respect naming convention