Athletics I guess, but I'd personally count the events ascompletely separate sports. I mean, just look at the build of a shot-putter and then a marathon runner - they couldnt be more different.
Track & Field
Athletics, just look at the schedule on the official site
Track & Field?
I know that there are loads of different types of swimming and rowing and cycling, but which event has the mot of these subcategories (not including emn and women as a separate one)? e.g. rowing has coxless 8, singles, pairs, pairs sculls atc.