More cleanup in closed-class word list in naming convention script