renamed fields for consistency (and added TODO for correct normal calculation)