#535 Remove support for acronyms