Update db models and correct spellings