Renamed some class files so they match with others.