Major refactor in class and method names.