MVC refactor

Rename to follow MVC naming more closely