Bugfixes
Moved bucket naming to utils