Renamed Classes

Rejigged class names to make more sense and create a better overall consistency.