Renamed some classes for better comprehension after some thought.