Refactor name to play nice with spell checker
Refactor class names