Remove underscore from Widget name