Refactored fields names