You might add another sword to take the rapiers place.
If you look at DnD the blades seeom to go Dagger, short sword,longsword, greatsword.
Looking at how historians categorise blades it tends to go : ( lengths given are high end)
knives
dagger (50 cm)
arming sword (90 cm)
longsword ( 130...