updated models to have correct names and datatypes