touched up app model fields
renamed models so rails sees them properly