Renaming

Rename Model classes and rename viewClass in ViewClass