Rename models and improve fixtutes