Rename functions in test code also -- fixing build-break from 2c021e0