Properly quote symbols
Update built-in abbreviations
abbreviation->nickname