Make names consistent and update bootstrap