Mod: rename field to avoid having the same name with reserved words