Fix for composer package name
Merge branch 'develop'