Change some field names to match DOM specified names