Renamed EeINS Classes