Renamed generic classes appropriately.