Installer fix
More namespace cleanups