Fix widget name issues