Renamed init, more XML changes