make sure names propogate to the right places