Change namevar to name rather then uuid