Rename fields for coherency