Fix: allow to rename field values