Rename some conditions

Give conditions names that reflect that they are conditions instead of upgrades now..
Depends on #7069.