Change models name for better understanding + Add error messages in templates