missed some renames in the tests