Bring back no name and simplify var merging