Renaming things and adding support for SSO