tower/aadl: unique names now take scope into account