I'm not gonna argue, it's up to you, I guess
Anyhow, your drawings are awesome.
At the end I reconsidered all the class and the naming and I changed all.
Basically I put first the class and then the vessel name and finally the operation years.
On the drawing of the head of the class I do not use the class name but I list all the units of the class itself.
Moreover I think that basically the class name is "country" related: when a ship like Tor or Varma are going to another country they lost the original class becoming "simple" units (or the head of a single-unit class which has no class denomination)
I think that this would be a suitable good approach to the class/ship naming... I'll open a discussion in General Discussion about this topic.
PS: you could note that I distinguish between civil and militarized icebreakers: the first ones are designated as IBs while the others are AGB or WAGB.
To de done Oden