Revert "a very hacky way to change data field names"

This reverts commit c65cec877a25da9a4b24066c3acaf982e2ef3e4e.