Fixed an error regarding wrong recepiename in roles.
reverted one file as it should not have been changed

Change-Id: I578d80cf7642ec7e301d7385ab7080e5bcdaf4f7