Renamed some Window class stuff.