Replace more abbreviations