Fixing conflicting field names