Changed html field names