Update NameChanger for new naming conventions
Merge pull request #1587 from Cottser/namechanger

Update NameChanger for new naming conventions