Proper naming of suite variable
Improved bootstrap script