TASKMAN-6: Improve fields naming