Refactor fields naming