Expanded some acronyms