Fix uninstall and USERNAME references