Bug/1397/rename role