Updated abbreviations and names