renamed view classes to conform to the names in the API