Revert "Fixed some field names"

This reverts commit f245d733f27175ff42ec2bd045544e889ee6162c.