Add more abbreviations and special-case words in naming convention script