Added transforming viewnames used within the definition of views.
Changed some more functions to uppercase.