Refactor Upgrade => Condition[Level], ...
Closes #7047
Rename some conditions