set names based on locale
Merge branch 'issue-6' into develop