Renaming for new purpose. Updating tests.
Going green and refactoring. Reindenting to 2 spaces.