Rename bootstrap file and fix CS