More name changes!

To please both Paul and Rosemary