finished implementing name injection