Minor changes in models to be more correct in naming