Update models to match legacy db column names