Revert "changing field names"

This reverts commit 1f703dcd93ea66a020a7a4e14614ee2eba1f76c3.
original
Revert "original"

This reverts commit 96627bd9fe6a0487d3055be358408563fcdac4f8.