Renamed classes and methods to make them more accurate