update models and controllers.  gets weird with multiword names