Sync various field names with 0.34