Renamed classes and tests for clarity