*The five-discipline event has long been called the World Aquatics Championships, the "world championships" moniker is, I believe, just a shorthand for when there is no ambiguity.  The new category likely does need a (25 m) modifier after it, even though the "World Swimming Championships" should be enough to disambiguate them, it might not be.  I'll move the category there shortly  to keep my list accurate and not drive me insane, it is going to be easier to finish populating the category and then move it, rather than break the list into two.  As to whether "Medalists" belongs at the front or the end, I sort of saw your argument once, but I think I've come to the conclusion that I disagree for one-sport events where there is not the need for multiple categories.  Feel free to file a CFD after I move the category over, but I do think this format is best.