CON-1016 | Get rid of acronyms