one last rename for public release
Merge branch 'develop'