Renamed the models and the controller name to inlude *Model and *Controller in the names