fixes some spots we're still using camel case
Merge pull request #2373 from w33ble/naming-conventions

fixes some spots we're still using camel case