Renamed roles that a ondemand specific.