reverted Gabriël's addition of nabl-name since it breaks field lookup