Rename classes and fix CS