(MODULES-909 MODULES-919) Updates to handle future parser behavior for u...

...pper-cased class names, and variables named with a leading underscore.