Add two more abbreviated words in naming convention script