Revert CamelCase rule back to its original goodness

Shout out to @kafkasbug for watching this like a hawk and discovering that
the tests, in fact, did not cover all of this behavior.

Yet more fixes for #46