General clean up; Rename to BootstrapValidator