SMALL REFACTORING

CLASS NAMES CHANGED