Minor refactor of class and method names.