Shisha Manager cleanup - widget name cleanup #1.