Renamed classes and file to match more what they are.