Made name ready only based on roles
Merge branch 'amit' of https://github.com/bishups/pcc-main into amit