Renamed missed instances from the previous three commits.