Fixed the usage of the bundle name when taken from the suite name
Ensured consistent availability of the bundle setting
Locked the API by making some classes final