Fix to properly pass names around