Renamed classes to meet the 32 character limit on kattis