Add support for upper-case hacks