Updated widget names