Renamed and fixed previous merge.