Fixed for new name attribute
Merge branch 'master' into fixes