Merge branch 'hotfix/166'

Close #166
[#170] Ensure collection_name can be updated

- Added unit test
- Added collection name entry to scalar rest key listing
Merge branch 'hotfix/170' into develop

Forward port #170