Make names consistent so all tests pass.