Renamed classes for easier variable naming