Improved acronym stuff

Turns out that not all acronyms are all upper case.