fix sh/(v)hfstats, add CTY-3221 prefixes