likewise, my Orca class CFAV designations were changed to the incorrect HMCS one by Shipspotting admin.
Since the Orca class vessels replaced the then 50-year old, wooden-hulled, Yard Auxiliary General (YAG) training vessels, maybe they now should get this YAG-designation as well.
To me, the Orca class vessels are still quite different from other auxiliary vessels like tug boats or even smaller ones that have the CFAV-designation.
Auxiliary vessels like CFAV Abalone are certainly quite different from the Orca class vessels: http://www.shipspotting.com/gallery/photo.php?lid=2788176
Or why not simply refer them to, for example, Orca PCT55?