Fix some more naming conventions on classes and methods