Refactoring

Changed class & protocol names for clarity