Refactor code to ensure all class names are consistently camel or snake cased

**Is your feature request related to a problem? Please describe.**
Hard to guess class names at the moment due to inconsistent naming convention.

**Describe the solution you'd like**
Rename things and change where appropriate to ideally camel-case.
