Rename stuff to follow MVC naming.