Modified html field names to match application.