Merge branch 'hotfix/package-name'
Changed package name back to bee
Merge branch 'hotfix/package_name' into develop