Fixed more bugs in the role rename.