Renamed some fields to avoid duplicate field name exceptions