Refactoring models that did not follow proper convention.