Change some field names to comply with Go naming conventions