Update ModelViewController.java

Updated to name new relationships and classes appropriately.