Fix dev setup to work with new name changes