More bootstrap gem renaming related changes