Rename a few things in tests