Renamed more instances of the indexes