Rename of Role and Type