Renamed PointIndex classes