Fixed class names for Widget classes.