Fixing conflicted field name.