refactor variables to match role name