MNT: Refactoring class names to be more sensible