Fixed name and uninstall errors