Um, Refactoring my code

yet again swapping class names to better fit my methodology.