Changed Unit.name from mutable to non-mutable