*8212* rename handler class for consistency