*8212* class rename to enable a refactor