Refactored widget name