Refactored from a different class name