Got everything working with all the name changes.