Updated widget names with camalCase