Rename some test objects to be slightly clearer.