Renamed BlockBuilderControllerHelper to ControllerHelper