fixed up database field names