More consistent abbreviations