Reorder the name attribute

As we reference it in source make sure it is set earlier in the eval.