Remove unnecessary underscore replace in role