#516. Options renamed and added to install/uninstall.