Changed some more names around in preparation for the refactor to the mockup.