[NOJIRA]
renaming fields