Refractor modifier class names