Renamed some product leftovers