praveen|renaming fields and error message