Fix typos and references to the old role name