Renamed missed instances from the previous four commits.