Renamed tree eta to etas, and related variables