Style corrections

Camel case updates
Replacement of pattern matches with case