Fixes widget name generation