Fixes #116. Update for AbbreviationAsWordInNameCheck.