rename a couple more id things to key in the tests