fix names and remove bootstrap import