change names to users
Merge branch 'develop'