Include the node name

Change-Id: I1cf2aee446c1e51c8eb15f7d84c3e828f3716cce