Refactoring. renamed some properties and parameters in object model for
consistency.

Adding support for SSO.