Improved a lot of the naming, options, upgrade and uninstall.