Fix matchers regex that were only checking part of identifiers.
Fix CamelCase word splitting when last word is fully upper case.

This would probably be better with a more clever algorithm that would work on aNy_cAsE text.