Renamed nightend stuff