I want to suggest tag ‘One-piece’ should be separated.
I’m suggesting separation like these below.
- Covers both arms and legs → Bodysuit, Catsuit, Jumpsuit, Diving suit, etc.
- Covers only arms → Maillot, Tank suit, One-piece swimsuit, Leotard, Competitive swimsuit, etc.
- Covers only legs → Bodysuit, Catsuit, Jumpsuit, etc.
- No covers on both arms and legs → Maillot, Tank suit, One-piece swimsuit, Leotard, Competitive swimsuit, etc. (Maybe Monokini?)
I hope every single tag be separated by each tag, but I also think it’s hard and confusing. (Even I don’t know all)
I know there is also bodysuit doesn’t cover both arms and legs, someone may think it’s inappropriate to classify as kind of swimsuit/leotard but it’s because I don’t know exact English word can explain all of those kinds.