3.0 upgrade shell improvement

A few updates to the UpgradeShell for 3.0

* Add recent(ish) class renames.
* Improve missing/wrong options.
* Make internals a bit simpler.