Updated struct field names