update name convention
Merge branch 'master' into develop